comparison src/ov-usr-fcn.cc @ 6149:3a68a2dc6eb1

[project @ 2006-11-09 18:26:56 by jwe]
author jwe
date Thu, 09 Nov 2006 18:26:56 +0000
parents a4dc99e71752
children ea65de49e18e
comparison
equal deleted inserted replaced
6148:4010c7474c9b 6149:3a68a2dc6eb1
74 : octave_function (std::string (), std::string ()), 74 : octave_function (std::string (), std::string ()),
75 param_list (pl), ret_list (rl), cmd_list (cl), 75 param_list (pl), ret_list (rl), cmd_list (cl),
76 sym_tab (st), lead_comm (), trail_comm (), file_name (), 76 sym_tab (st), lead_comm (), trail_comm (), file_name (),
77 t_parsed (static_cast<time_t> (0)), 77 t_parsed (static_cast<time_t> (0)),
78 t_checked (static_cast<time_t> (0)), 78 t_checked (static_cast<time_t> (0)),
79 system_fcn_file (false), call_depth (0), 79 system_fcn_file (false), call_depth (0), num_named_args (0),
80 num_named_args (0), nested_function (false), 80 nested_function (false), inline_function (false), args_passed (),
81 args_passed (), num_args_passed (0), symtab_entry (0), 81 num_args_passed (0), symtab_entry (0), argn_sr (0),
82 argn_sr (0), nargin_sr (0), nargout_sr (0), varargin_sr (0) 82 nargin_sr (0), nargout_sr (0), varargin_sr (0)
83 { 83 {
84 if (param_list) 84 if (param_list)
85 num_named_args = param_list->length (); 85 num_named_args = param_list->length ();
86 } 86 }
87 87
301 301
302 octave_call_stack::push (this); 302 octave_call_stack::push (this);
303 303
304 unwind_protect::add (octave_call_stack::unwind_pop, 0); 304 unwind_protect::add (octave_call_stack::unwind_pop, 0);
305 305
306 if (! is_nested_function ()) 306 if (! (is_nested_function () || is_inline_function ()))
307 { 307 {
308 unwind_protect_ptr (curr_parent_function); 308 unwind_protect_ptr (curr_parent_function);
309 curr_parent_function = this; 309 curr_parent_function = this;
310 } 310 }
311 311