Mercurial > octave

diff libinterp/corefcn/load-path.cc @ 23519:4fe410bd918d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use DEFMETHOD for some built-in functions * load-path.cc (Fcommand_line_path, Frestoredefaultpath, F__pathorig__, Fpath, Faddpath, Frmpath, F__dump_load_path__): Use DEFMETHOD. * utils.cc (Ffile_in_loadpath, Fdir_in_loadpath): Use DEFMETHOD. * ov-class.cc (Fismethod, F__methods__): Use DEFMETHOD.
author John W. Eaton <jwe@octave.org>
date Fri, 19 May 2017 16:05:03 -0400
parents 8e310ef0fa97
children f6c5db0a02e7
line wrap: on
line diff
--- a/libinterp/corefcn/load-path.cc	Fri May 19 16:01:18 2017 -0400
+++ b/libinterp/corefcn/load-path.cc	Fri May 19 16:05:03 2017 -0400
@@ -2216,8 +2216,8 @@
   return ovl ();
 }
 
-DEFUN (command_line_path, args, ,
-       doc: /* -*- texinfo -*-
+DEFMETHOD (command_line_path, interp, args, ,
+           doc: /* -*- texinfo -*-
 @deftypefn {} {} command_line_path ()
 Return the command line path variable.
 
@@ -2227,13 +2227,13 @@
   if (! args.empty ())
     print_usage ();
 
-  octave::load_path& lp = octave::__get_load_path__ ("command_line_path");
+  octave::load_path& lp = interp.get_load_path ();
 
   return ovl (lp.get_command_line_path ());
 }
 
-DEFUN (restoredefaultpath, args, ,
-       doc: /* -*- texinfo -*-
+DEFMETHOD (restoredefaultpath, interp, args, ,
+           doc: /* -*- texinfo -*-
 @deftypefn {} {} restoredefaultpath ()
 Restore Octave's path to its initial state at startup.
 
@@ -2243,7 +2243,7 @@
   if (! args.empty ())
     print_usage ();
 
-  octave::load_path& lp = octave::__get_load_path__ ("restoredefaultpath");
+  octave::load_path& lp = interp.get_load_path ();
 
   lp.initialize (true);
 
@@ -2255,21 +2255,21 @@
 // exists prior to running the system's octaverc file or the user's
 // ~/.octaverc file
 
-DEFUN (__pathorig__, , ,
-       doc: /* -*- texinfo -*-
+DEFMETHOD (__pathorig__, interp, , ,
+          doc: /* -*- texinfo -*-
 @deftypefn {} {@var{val} =} __pathorig__ ()
 Undocumented internal function.
 @end deftypefn */)
 {
-  octave::load_path& lp = octave::__get_load_path__ ("__pathorig__");
+  octave::load_path& lp = interp.get_load_path ();
 
   lp.initialize (true);
 
   return ovl (lp.system_path ());
 }
 
-DEFUN (path, args, nargout,
-       doc: /* -*- texinfo -*-
+DEFMETHOD (path, interp, args, nargout,
+           doc: /* -*- texinfo -*-
 @deftypefn  {} {} path ()
 @deftypefnx {} {@var{str} =} path ()
 @deftypefnx {} {@var{str} =} path (@var{path1}, @dots{})
@@ -2293,7 +2293,7 @@
 
   string_vector argv = args.make_argv ("path");
 
-  octave::load_path& lp = octave::__get_load_path__ ("path");
+  octave::load_path& lp = interp.get_load_path ();
 
   if (nargin > 0)
     {
@@ -2324,8 +2324,8 @@
   return ovl ();
 }
 
-DEFUN (addpath, args, nargout,
-       doc: /* -*- texinfo -*-
+DEFMETHOD (addpath, interp, args, nargout,
+           doc: /* -*- texinfo -*-
 @deftypefn  {} {} addpath (@var{dir1}, @dots{})
 @deftypefnx {} {} addpath (@var{dir1}, @dots{}, @var{option})
 Add named directories to the function search path.
@@ -2357,7 +2357,7 @@
   if (nargin == 0)
     print_usage ();
 
-  octave::load_path& lp = octave::__get_load_path__ ("addpath");
+  octave::load_path& lp = interp.get_load_path ();
 
   octave_value retval;
 
@@ -2436,8 +2436,8 @@
   return retval;
 }
 
-DEFUN (rmpath, args, nargout,
-       doc: /* -*- texinfo -*-
+DEFMETHOD (rmpath, interp, args, nargout,
+           doc: /* -*- texinfo -*-
 @deftypefn {} {} rmpath (@var{dir1}, @dots{})
 Remove @var{dir1}, @dots{} from the current function search path.
 
@@ -2465,7 +2465,7 @@
 
   octave_value retval;
 
-  octave::load_path& lp = octave::__get_load_path__ ("rmpath");
+  octave::load_path& lp = interp.get_load_path ();
 
   if (nargout > 0)
     retval = lp.path ();
@@ -2495,13 +2495,13 @@
   return retval;
 }
 
-DEFUN (__dump_load_path__, , ,
-       doc: /* -*- texinfo -*-
+DEFMETHOD (__dump_load_path__, interp, , ,
+           doc: /* -*- texinfo -*-
 @deftypefn {} {} __dump_load_path__ ()
 Undocumented internal function.
 @end deftypefn */)
 {
-  octave::load_path& lp = octave::__get_load_path__ ("__dump_load_path__");
+  octave::load_path& lp = interp.get_load_path ();
 
   lp.display (octave_stdout);