Mercurial > octave

changeset 23418:0412433f016f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rename load_path::loader to load_path::package_info * load-path.h, load-path.cc (load_path::package_info): Rename from load_path::loader. Change all uses. (load_path::get_package): Rename from load_path::get_loader. Change all uses. (load_path::package_info::m_package_name): Rename from load_path::package_info::prefix. Change all uses. (load_path::top_level_package): Rename from load_path::default_loader. Change all uses. (load_path::package_map): Rename from load_path::loader_map. Change all uses.
author John W. Eaton <jwe@octave.org>
date Thu, 20 Apr 2017 00:16:08 -0400
parents 80c1fc2b4112
children 75a4b9a34999
files libinterp/corefcn/load-path.cc libinterp/corefcn/load-path.h
diffstat 2 files changed, 75 insertions(+), 73 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/corefcn/load-path.cc	Wed Apr 19 21:04:28 2017 -0700
+++ b/libinterp/corefcn/load-path.cc	Thu Apr 20 00:16:08 2017 -0400
@@ -408,7 +408,7 @@
 }
 
 void
-load_path::loader::move_fcn_map (const std::string& dir_name,
+load_path::package_info::move_fcn_map (const std::string& dir_name,
                                  const string_vector& fcn_files, bool at_end)
 {
   octave_idx_type len = fcn_files.numel ();
@@ -457,7 +457,7 @@
 }
 
 void
-load_path::loader::move_method_map (const std::string& dir_name, bool at_end)
+load_path::package_info::move_method_map (const std::string& dir_name, bool at_end)
 {
   for (auto& cls_fnmap : method_map)
     {
@@ -519,9 +519,9 @@
 void
 load_path::move (const dir_info& di, bool at_end, const std::string& pname)
 {
-  loader& l = get_loader (pname);
-
-  l.move (di, at_end);
+  package_info& pkg = get_package (pname);
+
+  pkg.move (di, at_end);
 
   dir_info::package_dir_map_type package_dir_map = di.package_dir_map;
 
@@ -537,7 +537,7 @@
 }
 
 void
-load_path::loader::move (const dir_info& di, bool at_end)
+load_path::package_info::move (const dir_info& di, bool at_end)
 {
   std::string dir_name = di.dir_name;
 
@@ -618,9 +618,9 @@
 {
   dir_info_list.clear ();
 
-  default_loader.clear ();
-
-  loader_map.clear ();
+  top_level_package.clear ();
+
+  package_map.clear ();
 }
 
 static std::list<std::string>
@@ -795,7 +795,7 @@
 }
 
 void
-load_path::loader::remove_fcn_map (const std::string& dir,
+load_path::package_info::remove_fcn_map (const std::string& dir,
                                    const string_vector& fcn_files)
 {
   octave_idx_type len = fcn_files.numel ();
@@ -835,7 +835,7 @@
 }
 
 void
-load_path::loader::remove_private_fcn_map (const std::string& dir)
+load_path::package_info::remove_private_fcn_map (const std::string& dir)
 {
   private_fcn_map_iterator p = private_fcn_map.find (dir);
 
@@ -844,7 +844,7 @@
 }
 
 void
-load_path::loader::remove_method_map (const std::string& dir)
+load_path::package_info::remove_method_map (const std::string& dir)
 {
   for (auto& cls_fnmap : method_map)
     {
@@ -925,9 +925,9 @@
 void
 load_path::remove (const dir_info& di, const std::string& pname)
 {
-  loader& l = get_loader (pname);
-
-  l.remove (di);
+  package_info& pkg = get_package (pname);
+
+  pkg.remove (di);
 
   dir_info::package_dir_map_type package_dir_map = di.package_dir_map;
 
@@ -943,7 +943,7 @@
 }
 
 void
-load_path::loader::remove (const dir_info& di)
+load_path::package_info::remove (const dir_info& di)
 {
   std::string dir = di.dir_name;
 
@@ -965,9 +965,9 @@
   // preserve the correct directory ordering for new files that
   // have appeared.
 
-  default_loader.clear ();
-
-  loader_map.clear ();
+  top_level_package.clear ();
+
+  package_map.clear ();
 
   for (auto& di : dir_info_list)
     {
@@ -1072,7 +1072,7 @@
 }
 
 std::string
-load_path::loader::find_fcn (const std::string& fcn, std::string& dir_name,
+load_path::package_info::find_fcn (const std::string& fcn, std::string& dir_name,
                              int type) const
 {
   std::string retval;
@@ -1123,7 +1123,7 @@
 }
 
 std::string
-load_path::loader::find_private_fcn (const std::string& dir,
+load_path::package_info::find_private_fcn (const std::string& dir,
                                      const std::string& fcn, int type) const
 {
   std::string retval;
@@ -1153,7 +1153,7 @@
 }
 
 std::string
-load_path::loader::find_method (const std::string& class_name,
+load_path::package_info::find_method (const std::string& class_name,
                                 const std::string& meth,
                                 std::string& dir_name, int type) const
 {
@@ -1197,7 +1197,7 @@
 }
 
 std::list<std::string>
-load_path::loader::methods (const std::string& class_name) const
+load_path::package_info::methods (const std::string& class_name) const
 {
   std::list<std::string> retval;
 
@@ -1236,16 +1236,16 @@
 
   //  update ();
 
-  default_loader.overloads (meth, retval);
-
-  for (const auto& nm_ldr : loader_map)
+  top_level_package.overloads (meth, retval);
+
+  for (const auto& nm_ldr : package_map)
     nm_ldr.second.overloads (meth, retval);
 
   return retval;
 }
 
 void
-load_path::loader::overloads (const std::string& meth,
+load_path::package_info::overloads (const std::string& meth,
                               std::list<std::string>& l) const
 {
   for (const auto& cls_fnmap : method_map)
@@ -1256,8 +1256,8 @@
         {
           std::string class_name = cls_fnmap.first;
 
-          if (! prefix.empty ())
-            class_name = prefix + "." + class_name;
+          if (! m_package_name.empty ())
+            class_name = m_package_name + "." + class_name;
 
           l.push_back (class_name);
         }
@@ -1649,11 +1649,11 @@
 string_vector
 load_path::do_fcn_names (void) const
 {
-  return default_loader.fcn_names ();
+  return top_level_package.fcn_names ();
 }
 
 string_vector
-load_path::loader::fcn_names (void) const
+load_path::package_info::fcn_names (void) const
 {
   size_t len = fcn_map.size ();
 
@@ -1788,9 +1788,9 @@
         }
     }
 
-  default_loader.display (os);
-
-  for (const auto& nm_ldr : loader_map)
+  top_level_package.display (os);
+
+  for (const auto& nm_ldr : package_map)
     nm_ldr.second.display (os);
 }
 
@@ -1818,9 +1818,9 @@
 load_path::add (const dir_info& di, bool at_end,
                 const std::string& pname, bool updating) const
 {
-  loader& l = get_loader (pname);
-
-  l.add (di, at_end, updating);
+  package_info& pkg = get_package (pname);
+
+  pkg.add (di, at_end, updating);
 
   dir_info::package_dir_map_type package_dir_map = di.package_dir_map;
 
@@ -1836,7 +1836,7 @@
 }
 
 void
-load_path::loader::add_to_fcn_map (const dir_info& di, bool at_end,
+load_path::package_info::add_to_fcn_map (const dir_info& di, bool at_end,
                                    bool updating)
 {
   std::string dir_name = di.dir_name;
@@ -1939,7 +1939,7 @@
 }
 
 void
-load_path::loader::add_to_private_fcn_map (const dir_info& di)
+load_path::package_info::add_to_private_fcn_map (const dir_info& di)
 {
   dir_info::fcn_file_map_type private_file_map = di.private_file_map;
 
@@ -1948,7 +1948,7 @@
 }
 
 void
-load_path::loader::add_to_method_map (const dir_info& di, bool at_end)
+load_path::package_info::add_to_method_map (const dir_info& di, bool at_end)
 {
   std::string dir_name = di.dir_name;
 
@@ -2012,9 +2012,10 @@
 }
 
 void
-load_path::loader::display (std::ostream& os) const
+load_path::package_info::display (std::ostream& os) const
 {
-  os << "*** loader: " << (prefix.empty () ? "<top-level>" : prefix) << "\n\n";
+  os << "*** package info: "
+     << (m_package_name.empty () ? "<top-level>" : m_package_name) << "\n\n";
 
   for (const auto& dir : dir_list)
     os << dir << "\n";
@@ -2126,7 +2127,7 @@
 {
   std::list<std::string> retval;
 
-  for (const auto& dir_ldr : loader_map)
+  for (const auto& dir_ldr : package_map)
     {
       if (! only_top_level || dir_ldr.first.find ('.') == std::string::npos)
         retval.push_back (dir_ldr.first);
--- a/libinterp/corefcn/load-path.h	Wed Apr 19 21:04:28 2017 -0700
+++ b/libinterp/corefcn/load-path.h	Thu Apr 20 00:16:08 2017 -0400
@@ -42,7 +42,7 @@
 protected:
 
   load_path (void)
-    : loader_map (), default_loader (), dir_info_list (), init_dirs () { }
+    : package_map (), top_level_package (), dir_info_list (), init_dirs () { }
 
 public:
 
@@ -102,7 +102,7 @@
                                   const std::string& pack_name = "")
   {
     return instance_ok ()
-      ? instance->get_loader (pack_name).find_method (class_name, meth,
+      ? instance->get_package (pack_name).find_method (class_name, meth,
                                                       dir_name)
       : "";
   }
@@ -119,7 +119,7 @@
                                          const std::string& pack_name = "")
   {
     return instance_ok ()
-      ? instance->get_loader(pack_name).methods (class_name)
+      ? instance->get_package (pack_name).methods (class_name)
       : std::list<std::string> ();
   }
 
@@ -147,7 +147,7 @@
                                const std::string& pack_name = "")
   {
     return instance_ok ()
-      ? instance->get_loader (pack_name).find_fcn (fcn, dir_name)
+      ? instance->get_package (pack_name).find_fcn (fcn, dir_name)
       : "";
   }
 
@@ -163,7 +163,7 @@
                                        const std::string& pack_name = "")
   {
     return instance_ok ()
-      ? instance->get_loader (pack_name).find_private_fcn (dir, fcn)
+      ? instance->get_package (pack_name).find_private_fcn (dir, fcn)
       : "";
   }
 
@@ -173,7 +173,7 @@
     std::string dir_name;
 
     return instance_ok ()
-      ? instance->get_loader (pack_name).find_fcn (fcn, dir_name, M_FILE)
+      ? instance->get_package (pack_name).find_fcn (fcn, dir_name, M_FILE)
       : "";
   }
 
@@ -183,7 +183,7 @@
     std::string dir_name;
 
     return instance_ok ()
-      ? instance->get_loader (pack_name).find_fcn (fcn, dir_name, M_FILE)
+      ? instance->get_package (pack_name).find_fcn (fcn, dir_name, M_FILE)
       : "";
   }
 
@@ -193,7 +193,7 @@
     std::string dir_name;
 
     return instance_ok ()
-      ? instance->get_loader (pack_name).find_fcn (fcn, dir_name, M_FILE)
+      ? instance->get_package (pack_name).find_fcn (fcn, dir_name, M_FILE)
       : "";
   }
 
@@ -495,24 +495,24 @@
   typedef method_map_type::const_iterator const_method_map_iterator;
   typedef method_map_type::iterator method_map_iterator;
 
-  class loader
+  class package_info
   {
   public:
-    loader (const std::string& pfx = "")
-      : prefix (pfx), dir_list (), fcn_map (), private_fcn_map (),
+    package_info (const std::string& package_name = "")
+      : m_package_name (package_name), dir_list (), fcn_map (), private_fcn_map (),
         method_map () { }
 
-    loader (const loader& l)
-      : prefix (l.prefix), dir_list (l.dir_list),
+    package_info (const package_info& l)
+      : m_package_name (l.m_package_name), dir_list (l.dir_list),
         private_fcn_map (l.private_fcn_map), method_map (l.method_map) { }
 
-    ~loader (void) = default;
+    ~package_info (void) = default;
 
-    loader& operator = (const loader& l)
+    package_info& operator = (const package_info& l)
     {
       if (&l != this)
         {
-          prefix = l.prefix;
+          m_package_name = l.m_package_name;
           dir_list = l.dir_list;
           fcn_map = l.fcn_map;
           private_fcn_map = l.private_fcn_map;
@@ -592,7 +592,8 @@
     void remove_method_map (const std::string& dir);
 
   private:
-    std::string prefix;
+
+    std::string m_package_name;
 
     std::list<std::string> dir_list;
 
@@ -604,14 +605,14 @@
   };
 
   // <PACKAGE_NAME, LOADER>
-  typedef std::map<std::string, loader> loader_map_type;
+  typedef std::map<std::string, package_info> package_map_type;
 
-  typedef loader_map_type::const_iterator const_loader_map_iterator;
-  typedef loader_map_type::iterator loader_map_iterator;
+  typedef package_map_type::const_iterator const_package_map_iterator;
+  typedef package_map_type::iterator package_map_iterator;
 
-  mutable loader_map_type loader_map;
+  mutable package_map_type package_map;
 
-  mutable loader default_loader;
+  mutable package_info top_level_package;
 
   mutable dir_info_list_type dir_info_list;
 
@@ -670,27 +671,27 @@
 
   bool is_package (const std::string& name) const;
 
-  loader& get_loader (const std::string& name) const
+  package_info& get_package (const std::string& name) const
   {
     if (! name.empty () && is_package (name))
       {
-        loader_map_iterator l = loader_map.find (name);
+        package_map_iterator pi = package_map.find (name);
 
-        if (l == loader_map.end ())
-          l = loader_map.insert (loader_map.end (),
-                                 loader_map_type::value_type (name, loader (name)));
+        if (pi == package_map.end ())
+          pi = package_map.insert (package_map.end (),
+                                   package_map_type::value_type (name, package_info (name)));
 
-        return l->second;
+        return pi->second;
       }
 
-    return default_loader;
+    return top_level_package;
   }
 
   std::list<std::string> do_overloads (const std::string& meth) const;
 
   bool do_find_package (const std::string& package_name) const
   {
-    return (loader_map.find (package_name) != loader_map.end ());
+    return (package_map.find (package_name) != package_map.end ());
   }
 
   std::list<std::string> do_get_all_package_names (bool only_top_level) const;