Mercurial > octave-nkf

changeset 19050:b155fad47055

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix error messages and %!fail tests for schur(). * schur.cc (Fschur): Use '%s' instead of '%c' format code when issuing warning about incorrect second argument. Fix up %!error tests to match new output.
author Rik <rik@octave.org>
date Sat, 16 Aug 2014 22:44:26 -0700
parents ffa20d287355
children da7d9e4bda8c
files libinterp/corefcn/schur.cc
diffstat 1 files changed, 7 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/corefcn/schur.cc	Sat Aug 16 22:22:23 2014 -0700
+++ b/libinterp/corefcn/schur.cc	Sat Aug 16 22:44:26 2014 -0700
@@ -63,7 +63,7 @@
 @deftypefnx {Built-in Function} {@var{S} =} schur (@var{A}, \"real\")\n\
 @deftypefnx {Built-in Function} {@var{S} =} schur (@var{A}, \"complex\")\n\
 @deftypefnx {Built-in Function} {@var{S} =} schur (@var{A}, @var{opt})\n\
-@deftypefnx {Built-in Function} {[@var{U}, @var{S}] =} schur (@var{A}, @dots{})\n\
+@deftypefnx {Built-in Function} {[@var{U}, @var{S}] =} schur (@dots{})\n\
 @cindex Schur decomposition\n\
 Compute the Schur@tie{}decomposition of @var{A}\n\
 @tex\n\
@@ -170,7 +170,7 @@
       if (ord_char != 'U' && ord_char != 'A' && ord_char != 'D'
           && ord_char != 'u' && ord_char != 'a' && ord_char != 'd')
         {
-          warning ("schur: incorrect ordered schur argument '%c'",
+          warning ("schur: incorrect ordered schur argument '%s'",
                    ord.c_str ());
           return retval;
         }
@@ -287,10 +287,14 @@
 %! assert (u' * a * u, s, sqrt (eps ("single")));
 
 %!test
-%! fail ("schur ([1, 2; 3, 4], 2)", "warning");
+%! fail ('schur ([1, 2; 3, 4], "bad_opt")',
+%!       "warning", "incorrect ordered schur argument");
 
 %!error schur ()
+%!error schur (1,2,3)
+%!error [a,b,c] = schur (1)
 %!error <argument must be a square matrix> schur ([1, 2, 3; 4, 5, 6])
+%!error <wrong type argument 'cell'> schur ({1})
 */
 
 DEFUN (rsf2csf, args, nargout,