diff libinterp/corefcn/fcn-info.h @ 26970:340d44f2f942

backout changeset 98f1a964ff33 This changeset broke lookups for functions in packages. It may make sense to cache packages differently or as load_path initialization finds +package directories, but this changeset was the wrong thing to do. My apologies.
author John W. Eaton <jwe@octave.org>
date Mon, 25 Mar 2019 18:28:24 +0000
parents 4ff25d9b1eec
children b442ec6dda5c
line wrap: on
line diff
--- a/libinterp/corefcn/fcn-info.h	Mon Mar 25 12:13:06 2019 -0700
+++ b/libinterp/corefcn/fcn-info.h	Mon Mar 25 18:28:24 2019 +0000
@@ -74,6 +74,8 @@
 
       ~fcn_info_rep (void) = default;
 
+      octave_value install_local_function (const std::string& file_name);
+
       octave_value load_private_function (const std::string& dir_name);
 
       octave_value load_class_constructor (void);
@@ -98,11 +100,6 @@
         return function_on_path.is_defined ();
       }
 
-      bool is_package_defined (void) const
-      {
-        return package.is_defined ();
-      }
-
       octave_value find_function (const symbol_scope& search_scope,
                                   const octave_value_list& args)
       {
@@ -120,11 +117,6 @@
         local_functions[file_name] = f;
       }
 
-      void install_package (const octave_value& pack)
-      {
-        package = pack;
-      }
-
       void install_user_function (const octave_value& f)
       {
         function_on_path = f;
@@ -292,11 +284,6 @@
       return m_rep->is_user_function_defined ();
     }
 
-    bool is_package_defined (void) const
-    {
-      return m_rep->is_package_defined ();
-    }
-
     octave_value
     find_function (const symbol_scope& search_scope,
                    const octave_value_list& args = octave_value_list ())
@@ -315,11 +302,6 @@
       m_rep->install_local_function (f, file_name);
     }
 
-    void install_package (const octave_value& pack)
-    {
-      m_rep->install_package (pack);
-    }
-
     void install_user_function (const octave_value& f)
     {
       m_rep->install_user_function (f);