Mercurial > octave
changeset 23519:4fe410bd918d
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 | 8744d4ed8fb4 |
| children | 9f925aed7d1b |
| files | libinterp/corefcn/load-path.cc libinterp/corefcn/utils.cc libinterp/octave-value/ov-class.cc |
| diffstat | 3 files changed, 33 insertions(+), 33 deletions(-) [+] |
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);
--- a/libinterp/corefcn/utils.cc Fri May 19 16:01:18 2017 -0400 +++ b/libinterp/corefcn/utils.cc Fri May 19 16:05:03 2017 -0400 @@ -282,8 +282,8 @@ return retval; } -DEFUN (file_in_loadpath, args, , - doc: /* -*- texinfo -*- +DEFMETHOD (file_in_loadpath, interp, args, , + doc: /* -*- texinfo -*- @deftypefn {} {} file_in_loadpath (@var{file}) @deftypefnx {} {} file_in_loadpath (@var{file}, "all") @@ -312,7 +312,7 @@ if (names.empty ()) error ("file_in_loadpath: FILE argument must not be empty"); - octave::load_path& lp = octave::__get_load_path__ ("file_in_loadpath"); + octave::load_path& lp = interp.get_load_path (); if (nargin == 1) return ovl (octave::sys::env::make_absolute (lp.find_first_of (names))); @@ -982,8 +982,8 @@ %!error make_absolute_filename ("foo", "bar") */ -DEFUN (dir_in_loadpath, args, , - doc: /* -*- texinfo -*- +DEFMETHOD (dir_in_loadpath, interp, args, , + doc: /* -*- texinfo -*- @deftypefn {} {} dir_in_loadpath (@var{dir}) @deftypefnx {} {} dir_in_loadpath (@var{dir}, "all") Return the full name of the path element matching @var{dir}. @@ -1008,7 +1008,7 @@ dir = args(0).xstring_value ("dir_in_loadpath: DIR must be a directory name"); - octave::load_path& lp = octave::__get_load_path__ ("dir_in_loadpath"); + octave::load_path& lp = interp.get_load_path (); if (nargin == 1) return ovl (lp.find_dir (dir));
--- a/libinterp/octave-value/ov-class.cc Fri May 19 16:01:18 2017 -0400 +++ b/libinterp/octave-value/ov-class.cc Fri May 19 16:05:03 2017 -0400 @@ -1901,8 +1901,8 @@ return ovl (args(0).is_object ()); } -DEFUN (ismethod, args, , - doc: /* -*- texinfo -*- +DEFMETHOD (ismethod, interp, args, , + doc: /* -*- texinfo -*- @deftypefn {} {} ismethod (@var{obj}, @var{method}) @deftypefnx {} {} ismethod (@var{clsname}, @var{method}) Return true if the string @var{method} is a valid method of the object @@ -1926,7 +1926,7 @@ std::string method = args(1).string_value (); - octave::load_path& lp = octave::__get_load_path__ ("ismethod"); + octave::load_path& lp = interp.get_load_path (); if (lp.find_method (class_name, method) != "") return ovl (true); @@ -1934,8 +1934,8 @@ return ovl (false); } -DEFUN (__methods__, args, , - doc: /* -*- texinfo -*- +DEFMETHOD (__methods__, interp, args, , + doc: /* -*- texinfo -*- @deftypefn {} {} __methods__ (@var{x}) @deftypefnx {} {} __methods__ ("classname") Internal function. @@ -1954,7 +1954,7 @@ else if (arg.is_string ()) class_name = arg.string_value (); - octave::load_path& lp = octave::__get_load_path__ ("__methods__"); + octave::load_path& lp = interp.get_load_path (); string_vector sv = lp.methods (class_name);