Mercurial > octave

annotate scripts/miscellaneous/methods.m @ 26766:c1d5a0a799b2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
methods.m: Fix bug when function signature has spaces. * methods.m: Change regular expression that finds function names from list of function signatures to correctly accept signatures with spaces such as "unsigned int".
author Rik <rik@octave.org>
date Thu, 21 Feb 2019 15:28:32 -0800
parents 8554becefe1b
children ebf5ef76f56e
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
26376
00f796120a6d maint: Update copyright dates in all source files.
John W. Eaton <jwe@octave.org>
parents: 25054
diff changeset
1 ## Copyright (C) 2012-2019 Rik Wehbring
15785
42cff4396de4 Add methods.m which extends methods() to work on Java objects.
Rik <rik@octave.org>
parents:
diff changeset
2 ##
42cff4396de4 Add methods.m which extends methods() to work on Java objects.
Rik <rik@octave.org>
parents:
diff changeset
3 ## This file is part of Octave.
42cff4396de4 Add methods.m which extends methods() to work on Java objects.
Rik <rik@octave.org>
parents:
diff changeset
4 ##
24534
194eb4bd202b maint: Update punctuation for GPL v3 license text.
Rik <rik@octave.org>
parents: 24491
diff changeset
5 ## Octave is free software: you can redistribute it and/or modify it
15785
42cff4396de4 Add methods.m which extends methods() to work on Java objects.
Rik <rik@octave.org>
parents:
diff changeset
6 ## under the terms of the GNU General Public License as published by
24534
194eb4bd202b maint: Update punctuation for GPL v3 license text.
Rik <rik@octave.org>
parents: 24491
diff changeset
7 ## the Free Software Foundation, either version 3 of the License, or
22755
3a2b891d0b33 maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents: 22497
diff changeset
8 ## (at your option) any later version.
15785
42cff4396de4 Add methods.m which extends methods() to work on Java objects.
Rik <rik@octave.org>
parents:
diff changeset
9 ##
42cff4396de4 Add methods.m which extends methods() to work on Java objects.
Rik <rik@octave.org>
parents:
diff changeset
10 ## Octave is distributed in the hope that it will be useful, but
42cff4396de4 Add methods.m which extends methods() to work on Java objects.
Rik <rik@octave.org>
parents:
diff changeset
11 ## WITHOUT ANY WARRANTY; without even the implied warranty of
22755
3a2b891d0b33 maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents: 22497
diff changeset
12 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3a2b891d0b33 maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents: 22497
diff changeset
13 ## GNU General Public License for more details.
15785
42cff4396de4 Add methods.m which extends methods() to work on Java objects.
Rik <rik@octave.org>
parents:
diff changeset
14 ##
42cff4396de4 Add methods.m which extends methods() to work on Java objects.
Rik <rik@octave.org>
parents:
diff changeset
15 ## You should have received a copy of the GNU General Public License
42cff4396de4 Add methods.m which extends methods() to work on Java objects.
Rik <rik@octave.org>
parents:
diff changeset
16 ## along with Octave; see the file COPYING. If not, see
24534
194eb4bd202b maint: Update punctuation for GPL v3 license text.
Rik <rik@octave.org>
parents: 24491
diff changeset
17 ## <https://www.gnu.org/licenses/>.
15785
42cff4396de4 Add methods.m which extends methods() to work on Java objects.
Rik <rik@octave.org>
parents:
diff changeset
18
42cff4396de4 Add methods.m which extends methods() to work on Java objects.
Rik <rik@octave.org>
parents:
diff changeset
19 ## -*- texinfo -*-
20852
516bb87ea72e 2015 Code Sprint: remove class of function from docstring for all m-files.
Rik <rik@octave.org>
parents: 20539
diff changeset
20 ## @deftypefn {} {} methods (@var{obj})
516bb87ea72e 2015 Code Sprint: remove class of function from docstring for all m-files.
Rik <rik@octave.org>
parents: 20539
diff changeset
21 ## @deftypefnx {} {} methods ("@var{classname}")
516bb87ea72e 2015 Code Sprint: remove class of function from docstring for all m-files.
Rik <rik@octave.org>
parents: 20539
diff changeset
22 ## @deftypefnx {} {@var{mtds} =} methods (@dots{})
22167
6c94c7bd55e7 doc: Reword methods doc string for clarity
Mike Miller <mtmiller@octave.org>
parents: 21634
diff changeset
23 ## List the names of the public methods for the object @var{obj} or the
6c94c7bd55e7 doc: Reword methods doc string for clarity
Mike Miller <mtmiller@octave.org>
parents: 21634
diff changeset
24 ## named class @var{classname}.
20158
7503499a252b doc: Update docstrings to have one sentence summary as first line.
Rik <rik@octave.org>
parents: 19697
diff changeset
25 ##
15785
42cff4396de4 Add methods.m which extends methods() to work on Java objects.
Rik <rik@octave.org>
parents:
diff changeset
26 ## @var{obj} may be an Octave class object or a Java object.
22167
6c94c7bd55e7 doc: Reword methods doc string for clarity
Mike Miller <mtmiller@octave.org>
parents: 21634
diff changeset
27 ## @var{classname} may be the name of an Octave class or a Java class.
15785
42cff4396de4 Add methods.m which extends methods() to work on Java objects.
Rik <rik@octave.org>
parents:
diff changeset
28 ##
22167
6c94c7bd55e7 doc: Reword methods doc string for clarity
Mike Miller <mtmiller@octave.org>
parents: 21634
diff changeset
29 ## When called with no output arguments, @code{methods} prints the list of
6c94c7bd55e7 doc: Reword methods doc string for clarity
Mike Miller <mtmiller@octave.org>
parents: 21634
diff changeset
30 ## method names to the screen. Otherwise, the output argument @var{mtds}
6c94c7bd55e7 doc: Reword methods doc string for clarity
Mike Miller <mtmiller@octave.org>
parents: 21634
diff changeset
31 ## contains the list in a cell array of strings.
15785
42cff4396de4 Add methods.m which extends methods() to work on Java objects.
Rik <rik@octave.org>
parents:
diff changeset
32 ## @seealso{fieldnames}
42cff4396de4 Add methods.m which extends methods() to work on Java objects.
Rik <rik@octave.org>
parents:
diff changeset
33 ## @end deftypefn
42cff4396de4 Add methods.m which extends methods() to work on Java objects.
Rik <rik@octave.org>
parents:
diff changeset
34
26761
8554becefe1b handle -full argument for methods function (bug #55487)
John W. Eaton <jwe@octave.org>
parents: 26724
diff changeset
35 function mtds = methods (obj, opt)
19593
446c46af4b42 strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents: 17744
diff changeset
36
26761
8554becefe1b handle -full argument for methods function (bug #55487)
John W. Eaton <jwe@octave.org>
parents: 26724
diff changeset
37 if (nargin < 1 || nargin > 2)
15785
42cff4396de4 Add methods.m which extends methods() to work on Java objects.
Rik <rik@octave.org>
parents:
diff changeset
38 print_usage ();
42cff4396de4 Add methods.m which extends methods() to work on Java objects.
Rik <rik@octave.org>
parents:
diff changeset
39 endif
19593
446c46af4b42 strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents: 17744
diff changeset
40
26761
8554becefe1b handle -full argument for methods function (bug #55487)
John W. Eaton <jwe@octave.org>
parents: 26724
diff changeset
41 showsigs = (nargin > 1 && ischar (opt) && strcmp (opt, "-full"));
8554becefe1b handle -full argument for methods function (bug #55487)
John W. Eaton <jwe@octave.org>
parents: 26724
diff changeset
42 havesigs = false;
8554becefe1b handle -full argument for methods function (bug #55487)
John W. Eaton <jwe@octave.org>
parents: 26724
diff changeset
43
15785
42cff4396de4 Add methods.m which extends methods() to work on Java objects.
Rik <rik@octave.org>
parents:
diff changeset
44 if (isobject (obj))
42cff4396de4 Add methods.m which extends methods() to work on Java objects.
Rik <rik@octave.org>
parents:
diff changeset
45 ## Call internal C++ function for Octave objects
42cff4396de4 Add methods.m which extends methods() to work on Java objects.
Rik <rik@octave.org>
parents:
diff changeset
46 mtds_list = __methods__ (obj);
42cff4396de4 Add methods.m which extends methods() to work on Java objects.
Rik <rik@octave.org>
parents:
diff changeset
47 elseif (ischar (obj))
42cff4396de4 Add methods.m which extends methods() to work on Java objects.
Rik <rik@octave.org>
parents:
diff changeset
48 ## Could be a classname for an Octave class or Java class.
42cff4396de4 Add methods.m which extends methods() to work on Java objects.
Rik <rik@octave.org>
parents:
diff changeset
49 ## Try Octave class first.
42cff4396de4 Add methods.m which extends methods() to work on Java objects.
Rik <rik@octave.org>
parents:
diff changeset
50 mtds_list = __methods__ (obj);
42cff4396de4 Add methods.m which extends methods() to work on Java objects.
Rik <rik@octave.org>
parents:
diff changeset
51 if (isempty (mtds_list))
15790
921912c92102 Deprecate java_invoke, replace with javaMethod.
Rik <rik@octave.org>
parents: 15785
diff changeset
52 mtds_str = javaMethod ("getMethods", "org.octave.ClassHelper", obj);
16724
b7667fcb9fbc Substitute ostrsplit() for strsplit().
Ben Abbott <bpabbott@mac.com>
parents: 16403
diff changeset
53 mtds_list = ostrsplit (mtds_str, ';');
26761
8554becefe1b handle -full argument for methods function (bug #55487)
John W. Eaton <jwe@octave.org>
parents: 26724
diff changeset
54 havesigs = true;
15785
42cff4396de4 Add methods.m which extends methods() to work on Java objects.
Rik <rik@octave.org>
parents:
diff changeset
55 endif
42cff4396de4 Add methods.m which extends methods() to work on Java objects.
Rik <rik@octave.org>
parents:
diff changeset
56 elseif (isjava (obj))
20539
5d31cd795c21 methods.m: try Java class names if getMethods fails on Java objects (bug #46010)
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 20158
diff changeset
57 ## FIXME: Function prototype accepts java obj, but doesn't work if obj
5d31cd795c21 methods.m: try Java class names if getMethods fails on Java objects (bug #46010)
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 20158
diff changeset
58 ## is e.g., java.lang.String. Convert obj to classname then.
5d31cd795c21 methods.m: try Java class names if getMethods fails on Java objects (bug #46010)
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 20158
diff changeset
59 try
5d31cd795c21 methods.m: try Java class names if getMethods fails on Java objects (bug #46010)
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 20158
diff changeset
60 mtds_str = javaMethod ("getMethods", "org.octave.ClassHelper", obj);
5d31cd795c21 methods.m: try Java class names if getMethods fails on Java objects (bug #46010)
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 20158
diff changeset
61 catch
5d31cd795c21 methods.m: try Java class names if getMethods fails on Java objects (bug #46010)
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 20158
diff changeset
62 obj = class (obj);
5d31cd795c21 methods.m: try Java class names if getMethods fails on Java objects (bug #46010)
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 20158
diff changeset
63 mtds_str = javaMethod ("getMethods", "org.octave.ClassHelper", obj);
5d31cd795c21 methods.m: try Java class names if getMethods fails on Java objects (bug #46010)
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 20158
diff changeset
64 end_try_catch
16724
b7667fcb9fbc Substitute ostrsplit() for strsplit().
Ben Abbott <bpabbott@mac.com>
parents: 16403
diff changeset
65 mtds_list = strsplit (mtds_str, ';');
26761
8554becefe1b handle -full argument for methods function (bug #55487)
John W. Eaton <jwe@octave.org>
parents: 26724
diff changeset
66 havesigs = true;
15785
42cff4396de4 Add methods.m which extends methods() to work on Java objects.
Rik <rik@octave.org>
parents:
diff changeset
67 else
26761
8554becefe1b handle -full argument for methods function (bug #55487)
John W. Eaton <jwe@octave.org>
parents: 26724
diff changeset
68 error ("methods: invalid input argument");
8554becefe1b handle -full argument for methods function (bug #55487)
John W. Eaton <jwe@octave.org>
parents: 26724
diff changeset
69 endif
8554becefe1b handle -full argument for methods function (bug #55487)
John W. Eaton <jwe@octave.org>
parents: 26724
diff changeset
70
8554becefe1b handle -full argument for methods function (bug #55487)
John W. Eaton <jwe@octave.org>
parents: 26724
diff changeset
71 if (havesigs && ! showsigs)
26766
c1d5a0a799b2 methods.m: Fix bug when function signature has spaces.
Rik <rik@octave.org>
parents: 26761
diff changeset
72 mtds_list = regexprep (mtds_list, '^(?:[^(]+) (\w+) ?\(.*$', '$1');
26761
8554becefe1b handle -full argument for methods function (bug #55487)
John W. Eaton <jwe@octave.org>
parents: 26724
diff changeset
73 mtds_list = unique (mtds_list);
15785
42cff4396de4 Add methods.m which extends methods() to work on Java objects.
Rik <rik@octave.org>
parents:
diff changeset
74 endif
42cff4396de4 Add methods.m which extends methods() to work on Java objects.
Rik <rik@octave.org>
parents:
diff changeset
75
42cff4396de4 Add methods.m which extends methods() to work on Java objects.
Rik <rik@octave.org>
parents:
diff changeset
76 if (nargout == 0)
42cff4396de4 Add methods.m which extends methods() to work on Java objects.
Rik <rik@octave.org>
parents:
diff changeset
77 classname = ifelse (ischar (obj), obj, class (obj));
21634
96518f623c91 Backed out changeset dcf8922b724b
Mike Miller <mtmiller@octave.org>
parents: 21633
diff changeset
78 printf ("Methods for class %s:\n", classname);
15785
42cff4396de4 Add methods.m which extends methods() to work on Java objects.
Rik <rik@octave.org>
parents:
diff changeset
79 disp (list_in_columns (mtds_list));
42cff4396de4 Add methods.m which extends methods() to work on Java objects.
Rik <rik@octave.org>
parents:
diff changeset
80 else
42cff4396de4 Add methods.m which extends methods() to work on Java objects.
Rik <rik@octave.org>
parents:
diff changeset
81 mtds = mtds_list;
42cff4396de4 Add methods.m which extends methods() to work on Java objects.
Rik <rik@octave.org>
parents:
diff changeset
82 endif
42cff4396de4 Add methods.m which extends methods() to work on Java objects.
Rik <rik@octave.org>
parents:
diff changeset
83
42cff4396de4 Add methods.m which extends methods() to work on Java objects.
Rik <rik@octave.org>
parents:
diff changeset
84 endfunction
42cff4396de4 Add methods.m which extends methods() to work on Java objects.
Rik <rik@octave.org>
parents:
diff changeset
85
42cff4396de4 Add methods.m which extends methods() to work on Java objects.
Rik <rik@octave.org>
parents:
diff changeset
86
42cff4396de4 Add methods.m which extends methods() to work on Java objects.
Rik <rik@octave.org>
parents:
diff changeset
87 ## test Octave classname
42cff4396de4 Add methods.m which extends methods() to work on Java objects.
Rik <rik@octave.org>
parents:
diff changeset
88 %!test
42cff4396de4 Add methods.m which extends methods() to work on Java objects.
Rik <rik@octave.org>
parents:
diff changeset
89 %! mtds = methods ("ftp");
42cff4396de4 Add methods.m which extends methods() to work on Java objects.
Rik <rik@octave.org>
parents:
diff changeset
90 %! assert (mtds{1}, "ascii");
42cff4396de4 Add methods.m which extends methods() to work on Java objects.
Rik <rik@octave.org>
parents:
diff changeset
91
42cff4396de4 Add methods.m which extends methods() to work on Java objects.
Rik <rik@octave.org>
parents:
diff changeset
92 ## test Java classname
23405
32ec90068be5 use %!testif runtime tests to properly skip java tests
John W. Eaton <jwe@octave.org>
parents: 23220
diff changeset
93 %!testif HAVE_JAVA; usejava ("jvm")
26761
8554becefe1b handle -full argument for methods function (bug #55487)
John W. Eaton <jwe@octave.org>
parents: 26724
diff changeset
94 %! mtds = methods ("java.lang.Double", "-full");
8554becefe1b handle -full argument for methods function (bug #55487)
John W. Eaton <jwe@octave.org>
parents: 26724
diff changeset
95 %! search = strfind (mtds, "java.lang.Double valueOf");
8554becefe1b handle -full argument for methods function (bug #55487)
John W. Eaton <jwe@octave.org>
parents: 26724
diff changeset
96 %! assert (! isempty ([search{:}]));
8554becefe1b handle -full argument for methods function (bug #55487)
John W. Eaton <jwe@octave.org>
parents: 26724
diff changeset
97
8554becefe1b handle -full argument for methods function (bug #55487)
John W. Eaton <jwe@octave.org>
parents: 26724
diff changeset
98 ## test Java classname
8554becefe1b handle -full argument for methods function (bug #55487)
John W. Eaton <jwe@octave.org>
parents: 26724
diff changeset
99 %!testif HAVE_JAVA; usejava ("jvm")
15785
42cff4396de4 Add methods.m which extends methods() to work on Java objects.
Rik <rik@octave.org>
parents:
diff changeset
100 %! mtds = methods ("java.lang.Double");
26761
8554becefe1b handle -full argument for methods function (bug #55487)
John W. Eaton <jwe@octave.org>
parents: 26724
diff changeset
101 %! search = strfind (mtds, "valueOf");
15785
42cff4396de4 Add methods.m which extends methods() to work on Java objects.
Rik <rik@octave.org>
parents:
diff changeset
102 %! assert (! isempty ([search{:}]));
26724
84355b7b9521 allow methods function to work for classdef objects (bug #42510)
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
103
84355b7b9521 allow methods function to work for classdef objects (bug #42510)
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
104 ## classdef
84355b7b9521 allow methods function to work for classdef objects (bug #42510)
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
105 %!assert (methods ("inputParser"),
84355b7b9521 allow methods function to work for classdef objects (bug #42510)
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
106 %! {"addOptional"; "addParamValue"; "addParameter";
84355b7b9521 allow methods function to work for classdef objects (bug #42510)
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
107 %! "addRequired"; "addSwitch"; "add_missing"; "delete";
84355b7b9521 allow methods function to work for classdef objects (bug #42510)
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
108 %! "disp"; "error"; "is_argname"; "parse"; "validate_arg";
84355b7b9521 allow methods function to work for classdef objects (bug #42510)
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
109 %! "validate_name"});