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

annotate libinterp/corefcn/load-path.h @ 28026:262cdfc6faf9

allow reloading of handles to private functions (bug #57439) To allow a handle to a private function to reload the function it references after the function has been cleared and/or when the directory where the function was defined is no longer in the load path, store the directory in the symbol scope for the function, not just in the function itself. Also use the canonical directory name as the key for the private_function map in the load path. * fcn-info.cc (fcn_info::fcn_info_rep::load_private_function): Use canonical directory name as key in private_functions map. (fcn_info::fcn_info_rep::xfind): Get function file and directory names directly from the search scope. (fcn_info::fcn_info_rep::x_builtin_find): Likewise. * load-path.h, load-path.cc (load_path::M_FILE, load_path::OCT_FILE, load_path::MEX_FILE): Now public. (find_private_fcn_file): New static function. (load_path::package_info::remove): Use canonical directory name as key for private function map. (load_path::package_info::add_to_private_fcn_map): Likewise. (load_path::package_info::add_to_method_map): Likewise. (load_path::package_info::remove_private_fcn_map): Likewise. (load_path::package_info::find_private_fcn): Likewise. If function is not found in map, search filesystem. * symscope.h, symscope.cc (symbol_scope_rep::m_fcn_file_name, symbol_scope_rep::m_dir_name): New data members. (symbol_scope::dup): Copy them. (symbol_scope::cache_fcn_file_name, symbol_scope::cache_dir_name, symbol_scope::fcn_file_name, symbol_scope::dir_name, symbol_scope_rep::cache_fcn_file_name, symbol_scope_rep::cache_dir_name, symbol_scope_rep::fcn_file_name, symbol_scope_rep::dir_name): New functions. * oct-parse.yy (base_parser::make_script): Also cache file and directory names in script scope. (base_parser::finish_function): Also cache file and directory names in function scope. * pt-fcn-handle.cc (tree_anon_fcn_handle::evaluate): Also cache file and directory names in new scope associated with the anonymous function object.

author	John W. Eaton <jwe@octave.org>
date	Thu, 30 Jan 2020 15:12:52 -0500
parents	bd51beb6205e
children	dff830c84726 0a5b15007766

rev	line source
27923 bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	1 ////////////////////////////////////////////////////////////////////////
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	2 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	3 // Copyright (C) 2006-2020 The Octave Project Developers
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	4 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	5 // See the file COPYRIGHT.md in the top-level directory of this
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	6 // distribution or <https://octave.org/copyright/>.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	7 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	8 // This file is part of Octave.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	9 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	10 // Octave is free software: you can redistribute it and/or modify it
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	11 // under the terms of the GNU General Public License as published by
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	12 // the Free Software Foundation, either version 3 of the License, or
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	13 // (at your option) any later version.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	14 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	15 // Octave is distributed in the hope that it will be useful, but
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	16 // WITHOUT ANY WARRANTY; without even the implied warranty of
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	17 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	18 // GNU General Public License for more details.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	19 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	20 // You should have received a copy of the GNU General Public License
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	21 // along with Octave; see the file COPYING. If not, see
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	22 // <https://www.gnu.org/licenses/>.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	23 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	24 ////////////////////////////////////////////////////////////////////////
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	25
20791 f7084eae3318 maint: Use Octave coding conventions for #if statements. Rik <rik@octave.org> parents: 20770 diff changeset	26 #if ! defined (octave_load_path_h)
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	27 #define octave_load_path_h 1
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	28
21244 1473547f50f5 include octave-config.h in public header files John W. Eaton <jwe@octave.org> parents: 21017 diff changeset	29 #include "octave-config.h"
1473547f50f5 include octave-config.h in public header files John W. Eaton <jwe@octave.org> parents: 21017 diff changeset	30
25344 4d3ce214da32 use std::function object for load-path add/remove hook functions John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	31 #include <functional>
8950 d865363208d6 include <iosfwd> instead of <iostream> in header files John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	32 #include <iosfwd>
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	33 #include <list>
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	34 #include <map>
22375 179d088a6375 Do the #include where they are needed. Carnë Draug <carandraug@octave.org> parents: 22323 diff changeset	35 #include <set>
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	36 #include <string>
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	37
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	38 #include "oct-time.h"
5835 07dd13bfc0ba [project @ 2006-05-31 18:21:49 by jwe] jwe parents: 5832 diff changeset	39 #include "pathsearch.h"
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	40 #include "str-vec.h"
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	41
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	42 namespace octave
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	43 {
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	44 class
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	45 OCTINTERP_API
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	46 load_path
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	47 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	48 public:
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	49
27394 489c74ac36da store reference to interpreter in load_path object John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	50 load_path (interpreter& interp);
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	51
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	52 typedef void (*hook_fcn_ptr) (const std::string& dir);
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	53
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	54 load_path (const load_path&) = delete;
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	55
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	56 load_path& operator = (const load_path&) = delete;
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	57
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	58 ~load_path (void) = default;
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	59
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	60 void initialize (bool set_initial_path = false);
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	61
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	62 void clear (void);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7017 diff changeset	63
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	64 void set (const std::string& p, bool warn = false, bool is_init = false);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7017 diff changeset	65
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	66 void append (const std::string& dir, bool warn = false);
16676 7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16547 diff changeset	67
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	68 void prepend (const std::string& dir, bool warn = false);
16676 7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16547 diff changeset	69
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	70 bool remove (const std::string& dir);
16676 7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16547 diff changeset	71
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	72 void update (void) const;
16676 7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16547 diff changeset	73
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	74 bool contains_canonical (const std::string& dir_name) const;
16676 7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16547 diff changeset	75
27396 930c0fbc003b move qt_interpreter_events::file_in_path to load_path::contains_file_in_dir John W. Eaton <jwe@octave.org> parents: 27394 diff changeset	76 bool contains_file_in_dir (const std::string& file_name,
930c0fbc003b move qt_interpreter_events::file_in_path to load_path::contains_file_in_dir John W. Eaton <jwe@octave.org> parents: 27394 diff changeset	77 const std::string& dir_name);
930c0fbc003b move qt_interpreter_events::file_in_path to load_path::contains_file_in_dir John W. Eaton <jwe@octave.org> parents: 27394 diff changeset	78
16676 7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16547 diff changeset	79 std::string find_method (const std::string& class_name,
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16547 diff changeset	80 const std::string& meth,
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16547 diff changeset	81 std::string& dir_name,
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	82 const std::string& pack_name = "")
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	83 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	84 return get_package (pack_name).find_method (class_name, meth, dir_name);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	85 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	86
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	87 std::string find_method (const std::string& class_name,
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	88 const std::string& meth,
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	89 const std::string& pack_name = "")
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	90 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	91 std::string dir_name;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	92 return find_method (class_name, meth, dir_name, pack_name);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	93 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	94
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	95 std::list<std::string> methods (const std::string& class_name,
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	96 const std::string& pack_name = "")
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	97 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	98 return get_package (pack_name).methods (class_name);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	99 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	100
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	101 std::list<std::string> overloads (const std::string& meth) const;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	102
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	103 bool find_package (const std::string& package_name) const
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	104 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	105 return (package_map.find (package_name) != package_map.end ());
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	106 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	107
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	108 std::list<std::string>
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	109 get_all_package_names (bool only_top_level = true) const;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	110
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	111 std::string find_fcn (const std::string& fcn, std::string& dir_name,
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	112 const std::string& pack_name = "")
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	113 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	114 return get_package (pack_name).find_fcn (fcn, dir_name);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	115 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	116
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	117 std::string find_fcn (const std::string& fcn,
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	118 const std::string& pack_name = "")
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	119 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	120 std::string dir_name;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	121 return find_fcn (fcn, dir_name, pack_name);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	122 }
16676 7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16547 diff changeset	123
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	124 std::string find_private_fcn (const std::string& dir,
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	125 const std::string& fcn,
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	126 const std::string& pack_name = "")
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	127 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	128 return get_package (pack_name).find_private_fcn (dir, fcn);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	129 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	130
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	131 std::string find_fcn_file (const std::string& fcn,
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	132 const std::string& pack_name = "")
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	133 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	134 std::string dir_name;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	135 return get_package (pack_name).find_fcn (fcn, dir_name, M_FILE);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	136 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	137
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	138 std::string find_oct_file (const std::string& fcn,
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	139 const std::string& pack_name = "")
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	140 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	141 std::string dir_name;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	142 return get_package (pack_name).find_fcn (fcn, dir_name, M_FILE);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	143 }
16676 7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16547 diff changeset	144
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	145 std::string find_mex_file (const std::string& fcn,
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	146 const std::string& pack_name = "")
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	147 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	148 std::string dir_name;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	149 return get_package (pack_name).find_fcn (fcn, dir_name, M_FILE);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	150 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	151
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	152 std::string find_file (const std::string& file) const;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	153
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	154 std::string find_dir (const std::string& dir) const;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	155
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	156 string_vector find_matching_dirs (const std::string& dir) const;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	157
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	158 std::string find_first_of (const string_vector& files) const;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	159
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	160 string_vector find_all_first_of (const string_vector& files) const;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	161
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	162 string_vector dirs (void) const;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	163
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	164 std::list<std::string> dir_list (void) const;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	165
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	166 string_vector files (const std::string& dir, bool omit_exts = false) const;
16676 7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16547 diff changeset	167
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16547 diff changeset	168 string_vector fcn_names (void) const;
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16547 diff changeset	169
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	170 std::string path (void) const;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	171
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	172 void display (std::ostream& os) const;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	173
25344 4d3ce214da32 use std::function object for load-path add/remove hook functions John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	174 std::function<void (const std::string&)> get_add_hook (void)
4d3ce214da32 use std::function object for load-path add/remove hook functions John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	175 {
4d3ce214da32 use std::function object for load-path add/remove hook functions John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	176 return add_hook;
4d3ce214da32 use std::function object for load-path add/remove hook functions John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	177 }
4d3ce214da32 use std::function object for load-path add/remove hook functions John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	178
4d3ce214da32 use std::function object for load-path add/remove hook functions John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	179 std::function<void (const std::string&)> get_remove_hook (void)
4d3ce214da32 use std::function object for load-path add/remove hook functions John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	180 {
4d3ce214da32 use std::function object for load-path add/remove hook functions John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	181 return remove_hook;
4d3ce214da32 use std::function object for load-path add/remove hook functions John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	182 }
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	183
25344 4d3ce214da32 use std::function object for load-path add/remove hook functions John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	184 void set_add_hook (const std::function<void (const std::string&)>& f)
4d3ce214da32 use std::function object for load-path add/remove hook functions John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	185 {
4d3ce214da32 use std::function object for load-path add/remove hook functions John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	186 add_hook = f;
4d3ce214da32 use std::function object for load-path add/remove hook functions John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	187 }
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	188
25344 4d3ce214da32 use std::function object for load-path add/remove hook functions John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	189 void set_remove_hook (const std::function<void (const std::string&)>& f)
4d3ce214da32 use std::function object for load-path add/remove hook functions John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	190 {
4d3ce214da32 use std::function object for load-path add/remove hook functions John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	191 remove_hook = f;
4d3ce214da32 use std::function object for load-path add/remove hook functions John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	192 }
4d3ce214da32 use std::function object for load-path add/remove hook functions John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	193
4d3ce214da32 use std::function object for load-path add/remove hook functions John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	194 void execute_pkg_add (const std::string& dir);
4d3ce214da32 use std::function object for load-path add/remove hook functions John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	195 void execute_pkg_del (const std::string& dir);
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	196
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	197 void set_command_line_path (const std::string& p)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	198 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	199 if (m_command_line_path.empty ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	200 m_command_line_path = p;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	201 else
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23445 diff changeset	202 m_command_line_path += directory_path::path_sep_str () + p;
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	203 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	204
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	205 std::string get_command_line_path (void) const
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	206 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	207 return m_command_line_path;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	208 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	209
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	210 std::string system_path (void) const { return sys_path; }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	211
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	212 static const int M_FILE = 1;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	213 static const int OCT_FILE = 2;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	214 static const int MEX_FILE = 4;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	215
28026 262cdfc6faf9 allow reloading of handles to private functions (bug #57439) John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	216 private:
262cdfc6faf9 allow reloading of handles to private functions (bug #57439) John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	217
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	218 class dir_info
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	219 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	220 public:
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	221
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	222 // <FCN_NAME, TYPE>
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	223 typedef std::map<std::string, int> fcn_file_map_type;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	224
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	225 typedef fcn_file_map_type::const_iterator const_fcn_file_map_iterator;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	226 typedef fcn_file_map_type::iterator fcn_file_map_iterator;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	227
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	228 struct class_info
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	229 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	230 class_info (void) : method_file_map (), private_file_map () { }
16676 7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16547 diff changeset	231
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	232 class_info (const class_info& ci)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	233 : method_file_map (ci.method_file_map),
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	234 private_file_map (ci.private_file_map)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	235 { }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	236
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	237 class_info& operator = (const class_info& ci)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	238 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	239 if (this != &ci)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	240 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	241 method_file_map = ci.method_file_map;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	242 private_file_map = ci.private_file_map;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	243 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	244 return *this;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	245 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	246
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	247 ~class_info (void) = default;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	248
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	249 fcn_file_map_type method_file_map;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	250 fcn_file_map_type private_file_map;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	251 };
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	252
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	253 // <CLASS_NAME, CLASS_INFO>
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	254 typedef std::map<std::string, class_info> method_file_map_type;
16676 7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16547 diff changeset	255
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	256 typedef method_file_map_type::const_iterator const_method_file_map_iterator;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	257 typedef method_file_map_type::iterator method_file_map_iterator;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	258
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	259 // <PACKAGE_NAME, DIR_INFO>
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	260 typedef std::map<std::string, dir_info> package_dir_map_type;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	261
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	262 typedef package_dir_map_type::const_iterator const_package_dir_map_iterator;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	263 typedef package_dir_map_type::iterator package_dir_map_iterator;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	264
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	265 // This default constructor is only provided so we can create a
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	266 // std::map of dir_info objects. You should not use this
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	267 // constructor for any other purpose.
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	268 dir_info (void) = default;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	269
26970 340d44f2f942 backout changeset 98f1a964ff33 John W. Eaton <jwe@octave.org> parents: 26781 diff changeset	270 dir_info (const std::string& d)
24367 1909f2d7a36e Backed out changeset 4e746afab617 John W. Eaton <jwe@octave.org> parents: 24363 diff changeset	271 : dir_name (d), abs_dir_name (), is_relative (false),
1909f2d7a36e Backed out changeset 4e746afab617 John W. Eaton <jwe@octave.org> parents: 24363 diff changeset	272 dir_mtime (), dir_time_last_checked (), all_files (), fcn_files (),
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	273 private_file_map (), method_file_map (), package_dir_map ()
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	274 {
26970 340d44f2f942 backout changeset 98f1a964ff33 John W. Eaton <jwe@octave.org> parents: 26781 diff changeset	275 initialize ();
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	276 }
16676 7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16547 diff changeset	277
24991 831389905438 omit argument name from default copy ctors and assignment operators John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	278 dir_info (const dir_info&) = default;
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	279
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	280 ~dir_info (void) = default;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	281
24991 831389905438 omit argument name from default copy ctors and assignment operators John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	282 dir_info& operator = (const dir_info&) = default;
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	283
25957 d8993fe43a64 remove nonexistent directories when updating loadpath John W. Eaton <jwe@octave.org> parents: 25460 diff changeset	284 bool update (void);
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	285
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	286 std::string dir_name;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	287 std::string abs_dir_name;
24367 1909f2d7a36e Backed out changeset 4e746afab617 John W. Eaton <jwe@octave.org> parents: 24363 diff changeset	288 bool is_relative;
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23445 diff changeset	289 sys::time dir_mtime;
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23445 diff changeset	290 sys::time dir_time_last_checked;
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	291 string_vector all_files;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	292 string_vector fcn_files;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	293 fcn_file_map_type private_file_map;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	294 method_file_map_type method_file_map;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	295 package_dir_map_type package_dir_map;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	296
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	297 bool is_package (const std::string& name) const;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	298
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	299 private:
16676 7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16547 diff changeset	300
26970 340d44f2f942 backout changeset 98f1a964ff33 John W. Eaton <jwe@octave.org> parents: 26781 diff changeset	301 void initialize (void);
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	302
26970 340d44f2f942 backout changeset 98f1a964ff33 John W. Eaton <jwe@octave.org> parents: 26781 diff changeset	303 void get_file_list (const std::string& d);
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	304
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	305 void get_private_file_map (const std::string& d);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	306
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	307 void get_method_file_map (const std::string& d,
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	308 const std::string& class_name);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	309
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	310 void get_package_dir (const std::string& d,
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	311 const std::string& package_name);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	312
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	313 friend fcn_file_map_type get_fcn_files (const std::string& d);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	314 };
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	315
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	316 class file_info
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	317 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	318 public:
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	319
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	320 file_info (const std::string& d, int t) : dir_name (d), types (t) { }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	321
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	322 file_info (const file_info& fi)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	323 : dir_name (fi.dir_name), types (fi.types) { }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	324
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	325 ~file_info (void) = default;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	326
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	327 file_info& operator = (const file_info& fi)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	328 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	329 if (&fi != this)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	330 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	331 dir_name = fi.dir_name;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	332 types = fi.types;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	333 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	334
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	335 return *this;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	336 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	337
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	338 std::string dir_name;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	339 int types;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	340 };
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7017 diff changeset	341
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	342 // We maintain two ways of looking at the same information.
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	343 //
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	344 // First, a list of directories and the set of "public" files and
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	345 // private files (those found in the special "private" subdirectory)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	346 // in each directory.
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	347 //
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	348 // Second, a map from filenames (the union of all "public" files for all
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	349 // directories, but without filename extensions) to a list of
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	350 // corresponding information (directory name and file types). This
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	351 // way, we can quickly find shadowed filenames and look up all
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	352 // overloaded functions (in the "@" directories used to implement
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	353 // classes).
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	354
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	355 typedef std::list<dir_info> dir_info_list_type;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	356
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	357 typedef dir_info_list_type::const_iterator const_dir_info_list_iterator;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	358 typedef dir_info_list_type::iterator dir_info_list_iterator;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	359
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	360 typedef std::map<std::string, dir_info> abs_dir_cache_type;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	361
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	362 typedef abs_dir_cache_type::const_iterator const_abs_dir_cache_iterator;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	363 typedef abs_dir_cache_type::iterator abs_dir_cache_iterator;
16676 7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16547 diff changeset	364
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	365 typedef std::list<file_info> file_info_list_type;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	366
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	367 typedef file_info_list_type::const_iterator const_file_info_list_iterator;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	368 typedef file_info_list_type::iterator file_info_list_iterator;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	369
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	370 // <FCN_NAME, FILE_INFO_LIST>
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	371 typedef std::map<std::string, file_info_list_type> fcn_map_type;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	372
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	373 typedef fcn_map_type::const_iterator const_fcn_map_iterator;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	374 typedef fcn_map_type::iterator fcn_map_iterator;
16676 7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16547 diff changeset	375
25376 cc40e47d3a44 track multiple file types (oct\|m\|mex) for private functions (bug #53856) John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	376 // <DIR_NAME, <FCN_NAME, TYPES>>
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	377 typedef std::map<std::string, dir_info::fcn_file_map_type>
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	378 private_fcn_map_type;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	379
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	380 typedef private_fcn_map_type::const_iterator const_private_fcn_map_iterator;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	381 typedef private_fcn_map_type::iterator private_fcn_map_iterator;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	382
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	383 // <CLASS_NAME, <FCN_NAME, FILE_INFO_LIST>>
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	384 typedef std::map<std::string, fcn_map_type> method_map_type;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	385
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	386 typedef method_map_type::const_iterator const_method_map_iterator;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	387 typedef method_map_type::iterator method_map_iterator;
16676 7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16547 diff changeset	388
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	389 class package_info
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	390 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	391 public:
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	392
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	393 package_info (const std::string& package_name = "")
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	394 : m_package_name (package_name), dir_list (), fcn_map (),
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	395 private_fcn_map (),
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	396 method_map ()
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	397 { }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	398
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	399 package_info (const package_info& l)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	400 : m_package_name (l.m_package_name), dir_list (l.dir_list),
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	401 private_fcn_map (l.private_fcn_map), method_map (l.method_map)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	402 { }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	403
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	404 ~package_info (void) = default;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	405
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	406 package_info& operator = (const package_info& l)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	407 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	408 if (&l != this)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	409 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	410 m_package_name = l.m_package_name;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	411 dir_list = l.dir_list;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	412 fcn_map = l.fcn_map;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	413 private_fcn_map = l.private_fcn_map;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	414 method_map = l.method_map;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	415 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	416
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	417 return *this;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	418 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	419
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	420 void add (const dir_info& di, bool at_end, bool updating)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	421 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	422 if (at_end)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	423 dir_list.push_back (di.dir_name);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	424 else
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	425 dir_list.push_front (di.dir_name);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	426
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	427 add_to_fcn_map (di, at_end, updating);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	428
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	429 add_to_private_fcn_map (di);
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	430
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	431 add_to_method_map (di, at_end);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	432 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	433
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	434 void move (const dir_info& di, bool at_end);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	435
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	436 void remove (const dir_info& di);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	437
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	438 void clear (void)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	439 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	440 dir_list.clear ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	441
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	442 fcn_map.clear ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	443
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	444 private_fcn_map.clear ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	445
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	446 method_map.clear ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	447 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	448
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	449 void display (std::ostream& out) const;
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	450
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	451 std::string
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	452 find_fcn (const std::string& fcn, std::string& dir_name,
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	453 int type = M_FILE \| OCT_FILE \| MEX_FILE) const;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	454
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	455 std::string
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	456 find_private_fcn (const std::string& dir, const std::string& fcn,
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	457 int type = M_FILE \| OCT_FILE \| MEX_FILE) const;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	458
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	459 std::string
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	460 find_method (const std::string& class_name, const std::string& meth,
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	461 std::string& dir_name,
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	462 int type = M_FILE \| OCT_FILE \| MEX_FILE) const;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	463
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	464 std::list<std::string> methods (const std::string& class_name) const;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	465
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	466 void overloads (const std::string& meth, std::list<std::string>& l) const;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	467
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	468 string_vector fcn_names (void) const;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	469
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	470 private:
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	471
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	472 void add_to_fcn_map (const dir_info& di, bool at_end, bool updating);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	473
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	474 void add_to_private_fcn_map (const dir_info& di);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	475
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	476 void add_to_method_map (const dir_info& di, bool at_end);
23418 0412433f016f rename load_path::loader to load_path::package_info John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	477
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	478 void move_fcn_map (const std::string& dir,
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	479 const string_vector& fcn_files, bool at_end);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	480
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	481 void move_method_map (const std::string& dir, bool at_end);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	482
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	483 void remove_fcn_map (const std::string& dir,
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	484 const string_vector& fcn_files);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	485
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	486 void remove_private_fcn_map (const std::string& dir);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	487
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	488 void remove_method_map (const std::string& dir);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	489
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	490 bool check_file_type (std::string& fname, int type, int possible_types,
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	491 const std::string& fcn, const char *who) const;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	492
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	493 void print_types (std::ostream& os, int types) const;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	494
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	495 void print_fcn_list (std::ostream& os,
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	496 const dir_info::fcn_file_map_type& lst) const;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	497
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	498 std::string m_package_name;
16676 7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16547 diff changeset	499
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	500 std::list<std::string> dir_list;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	501
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	502 fcn_map_type fcn_map;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	503
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	504 private_fcn_map_type private_fcn_map;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	505
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	506 method_map_type method_map;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	507 };
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	508
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	509 // <PACKAGE_NAME, PACKAGE_INFO>
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	510 typedef std::map<std::string, package_info> package_map_type;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	511
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	512 typedef package_map_type::const_iterator const_package_map_iterator;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	513 typedef package_map_type::iterator package_map_iterator;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	514
27394 489c74ac36da store reference to interpreter in load_path object John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	515 interpreter& m_interpreter;
489c74ac36da store reference to interpreter in load_path object John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	516
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	517 mutable package_map_type package_map;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	518
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	519 mutable package_info top_level_package;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	520
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	521 mutable dir_info_list_type dir_info_list;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	522
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	523 mutable std::set<std::string> init_dirs;
16676 7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16547 diff changeset	524
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	525 std::string m_command_line_path;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	526
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	527 static std::string sys_path;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	528
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	529 static abs_dir_cache_type abs_dir_cache;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	530
25344 4d3ce214da32 use std::function object for load-path add/remove hook functions John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	531 std::function<void (const std::string&)> add_hook;
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	532
25344 4d3ce214da32 use std::function object for load-path add/remove hook functions John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	533 std::function<void (const std::string&)> remove_hook;
4d3ce214da32 use std::function object for load-path add/remove hook functions John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	534
4d3ce214da32 use std::function object for load-path add/remove hook functions John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	535 void execute_pkg_add_or_del (const std::string& dir,
4d3ce214da32 use std::function object for load-path add/remove hook functions John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	536 const std::string& script_file);
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	537
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	538 const_dir_info_list_iterator find_dir_info (const std::string& dir) const;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	539 dir_info_list_iterator find_dir_info (const std::string& dir);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	540
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	541 bool contains (const std::string& dir) const;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	542
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	543 void move (dir_info_list_iterator i, bool at_end);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	544
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	545 void move (const dir_info& di, bool at_end, const std::string& pname = "");
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	546
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	547 void remove (const dir_info& di, const std::string& pname = "");
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	548
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	549 void add (const std::string& dir, bool at_end, bool warn);
16676 7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16547 diff changeset	550
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	551 void add (const dir_info& di, bool at_end, const std::string& pname = "",
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	552 bool updating = false) const;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	553
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	554 bool is_package (const std::string& name) const;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	555
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	556 package_info& get_package (const std::string& name) const
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	557 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	558 if (! name.empty () && is_package (name))
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	559 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	560 package_map_iterator l = package_map.find (name);
16676 7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16547 diff changeset	561
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	562 if (l == package_map.end ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	563 l = package_map.insert (package_map.end (),
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	564 package_map_type::value_type (name, package_info (name)));
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	565
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	566 return l->second;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	567 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	568
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	569 return top_level_package;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	570 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	571
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	572 string_vector get_file_list (const dir_info::fcn_file_map_type& lst) const;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	573
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	574 friend dir_info::fcn_file_map_type get_fcn_files (const std::string& d);
16676 7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16547 diff changeset	575 };
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16547 diff changeset	576
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	577 extern std::string
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	578 genpath (const std::string& dir, const string_vector& skip = "private");
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	579 }
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	580
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	581 #endif

Mercurial > octave

annotate libinterp/corefcn/load-path.h @ 28026:262cdfc6faf9