# HG changeset patch # User David Bateman # Date 1214390792 -7200 # Node ID 47983f21da8f22a99243d70b07d4dfd75de9a3cd # Parent 9de3ccd2e7acd52d69ce239876ef3dd4f5f197d1 Frats fix for nargin==0 diff --git a/src/ChangeLog b/src/ChangeLog --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2008-06-25 David Bateman + + * pr-output.cc (Frats): Print usage if nargin == 0. + 2008-06-20 Jaroslav Hajek * DLD-FUNCTIONS/regexp.cc (octregexp_list): Make "once" an output diff --git a/src/pr-output.cc b/src/pr-output.cc --- a/src/pr-output.cc +++ b/src/pr-output.cc @@ -2719,18 +2719,20 @@ int nargin = args.length (); - unwind_protect::begin_frame ("Frats"); - - unwind_protect_int (rat_string_len); - - rat_string_len = 9; - - if (nargin == 2) - rat_string_len = args(1).nint_value (); - - if (! error_state) + if (nargin < 1 || nargin > 2 || nargout > 1) + print_usage (); + else { - if (nargin < 3 && nargout < 2) + unwind_protect::begin_frame ("Frats"); + + unwind_protect_int (rat_string_len); + + rat_string_len = 9; + + if (nargin == 2) + rat_string_len = args(1).nint_value (); + + if (! error_state) { octave_value arg = args(0); @@ -2770,12 +2772,10 @@ else error ("rats: expecting numeric input"); } - else - print_usage (); + + unwind_protect::run_frame ("Frats"); } - unwind_protect::run_frame ("Frats"); - return retval; }