# HG changeset patch # User John W. Eaton # Date 1205428920 14400 # Node ID 90fb25a5a3fa50746a86d780628c0f05ea3c113d # Parent cbedf652a752627a6d0f5e9c63171da15d849d71 minor cleanup in octave_user_function constructor diff -r cbedf652a752 -r 90fb25a5a3fa src/ChangeLog --- a/src/ChangeLog Thu Mar 13 13:19:40 2008 -0400 +++ b/src/ChangeLog Thu Mar 13 13:22:00 2008 -0400 @@ -1,5 +1,8 @@ 2008-03-13 John W. Eaton + * ov-usr-fcn.cc (octave_user_function::octave_user_function): + Handle num_named_args in initialization list instead of functinon body. + * octave.gperf: Eliminate varargin and varargout keywords. * lex.l (is_keyword_token): Eliminate varargin_kw and varargout_kw from switch statement. diff -r cbedf652a752 -r 90fb25a5a3fa src/ov-usr-fcn.cc --- a/src/ov-usr-fcn.cc Thu Mar 13 13:19:40 2008 -0400 +++ b/src/ov-usr-fcn.cc Thu Mar 13 13:22:00 2008 -0400 @@ -101,14 +101,12 @@ lead_comm (), trail_comm (), file_name (), parent_name (), t_parsed (static_cast (0)), t_checked (static_cast (0)), - system_fcn_file (false), call_depth (0), num_named_args (0), + system_fcn_file (false), call_depth (0), + num_named_args (param_list ? param_list->length () : 0), nested_function (false), inline_function (false), class_constructor (false), class_method (false), xdispatch_class (), args_passed (), num_args_passed (0), local_scope (sid) -{ - if (param_list) - num_named_args = param_list->length (); -} +{ } octave_user_function::~octave_user_function (void) {