From: <car...@us...> - 2012-05-14 07:19:14
|
Revision: 10431 http://octave.svn.sourceforge.net/octave/?rev=10431&view=rev Author: carandraug Date: 2012-05-14 07:19:05 +0000 (Mon, 14 May 2012) Log Message: ----------- inpuParser: check for correct call to parse before starting it to avoid weird errors and print_usage Modified Paths: -------------- trunk/octave-forge/main/general/inst/@inputParser/subsref.m Modified: trunk/octave-forge/main/general/inst/@inputParser/subsref.m =================================================================== --- trunk/octave-forge/main/general/inst/@inputParser/subsref.m 2012-05-14 07:10:59 UTC (rev 10430) +++ trunk/octave-forge/main/general/inst/@inputParser/subsref.m 2012-05-14 07:19:05 UTC (rev 10431) @@ -62,17 +62,17 @@ ## ParamValue mixed with Switch. Any other order makes no sense function inPar = parse_args (inPar, idx) - ## make copy of ordered list of Parameters to keep the original intact and readable - inPar.copy = inPar.Parameters; - - ## this makes it easier to read but may be memory instensive - args = idx(2).subs; - ## syntax is inPar.parse (arguments) if ( numel(idx) != 2 || idx(2).type != '()' ) print_usage ("@inputParser/parse"); endif + ## this makes it easier to read but may be memory instensive + args = idx(2).subs; + + ## make copy of ordered list of Parameters to keep the original intact and readable + inPar.copy = inPar.Parameters; + if ( numel (fieldnames (inPar.Required)) > numel (args) ) error("%sNot enough arguments", inPar.FunctionName); endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |