Mercurial > octave

changeset 23333:b636f10ce53f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix display methods to only expect one argument * @ftp/display.m, @audioplayer/display.m, @audiorecorder/display.m: Accept one argument only. Use inputname to get object name. * inputParser.m (display): Likewise.
author John W. Eaton <jwe@octave.org>
date Wed, 29 Mar 2017 14:32:14 -0400
parents 7d4ca8c01bbb
children 74db993b2ac4
files scripts/@ftp/display.m scripts/audio/@audioplayer/display.m scripts/audio/@audiorecorder/display.m scripts/general/inputParser.m
diffstat 4 files changed, 12 insertions(+), 21 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/@ftp/display.m	Wed Mar 29 14:25:29 2017 -0400
+++ b/scripts/@ftp/display.m	Wed Mar 29 14:32:14 2017 -0400
@@ -16,15 +16,13 @@
 ## along with Octave; see the file COPYING.  If not, see
 ## <http://www.gnu.org/licenses/>.
 
-function display (obj, name)
+function display (obj)
 
-  if (nargin > 2 || (nargin == 2 && ! ischar (name)))
+  if (nargin != 1)
     print_usage ();
   endif
 
-  if (nargin == 2)
-    printf ("%s = ", name);
-  endif
+  printf ("%s = ", inputname (1));
   printf ("FTP Object\n");
   printf (" host: %s\n", obj.host);
   printf (" user: %s\n", obj.username);
--- a/scripts/audio/@audioplayer/display.m	Wed Mar 29 14:25:29 2017 -0400
+++ b/scripts/audio/@audioplayer/display.m	Wed Mar 29 14:32:14 2017 -0400
@@ -21,15 +21,13 @@
 ## Display the properties of the audioplayer object @var{player}.
 ## @end deftypefn
 
-function display (player, name)
+function display (player)
 
-  if (nargin > 2 || (nargin == 2 && ! ischar (name)))
+  if (nargin != 1)
     print_usage ();
   endif
 
-  if (nargin == 2)
-    printf ("%s = ", name);
-  endif
+  printf ("%s = ", inputname (1));
   disp (__get_properties__ (player));
 
 endfunction
--- a/scripts/audio/@audiorecorder/display.m	Wed Mar 29 14:25:29 2017 -0400
+++ b/scripts/audio/@audiorecorder/display.m	Wed Mar 29 14:32:14 2017 -0400
@@ -21,15 +21,13 @@
 ## Display the properties of the audiorecorder object @var{recorder}.
 ## @end deftypefn
 
-function display (recorder, name)
+function display (recorder)
 
-  if (nargin > 2 || (nargin == 2 && ! ischar (name)))
+  if (nargin != 1)
     print_usage ();
   endif
 
-  if (nargin == 2)
-    printf ("%s = ", name);
-  endif
+  printf ("%s = ", inputname (1));
   disp (__get_properties__ (recorder));
 
 endfunction
--- a/scripts/general/inputParser.m	Wed Mar 29 14:25:29 2017 -0400
+++ b/scripts/general/inputParser.m	Wed Mar 29 14:32:14 2017 -0400
@@ -472,14 +472,11 @@
 
     endfunction
 
-    function display (this, name)
-      if ((nargin > 2) || ((nargin == 2) && ~ischar (name)))
+    function display (this)
+      if (nargin != 1)
         print_usage ();
       endif
-      if (nargin == 2)
-        printf ("%s = ", name);
-      endif
-      printf ("inputParser object with properties:\n\n");
+      printf ("%s = inputParser object with properties:\n\n", inputname ());
       b2s = @(x) ifelse (any (x), "true", "false");
       printf (["   CaseSensitive   : %s\n   FunctionName    : %s\n" ...
                "   KeepUnmatched   : %s\n   PartialMatching : %s\n" ...