Mercurial > hg > octave-nkf

comparison src/pt-fcn-handle.cc @ 13241:2a8dcb5b3a00

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
improve default indexing for objects * ov-class.cc (octave_class::is_class_method): Also return true for anonymous functions executing in the context of a class method or constructor. * ov-class.h (octave_class:do_multi_index_op): New function. * ov-fcn.h (octave_function::is_private_function_of_class): Now const. (octave_function::is_anonymous_function_of_class): New virtual function. * ov-usr-fcn.h (octave_function::anonymous_function): New data member. (octave_user_function::mark_as_anonymous_function): New function. (octave_user_function::is_anonymous_function): New function. (octave_user_function::is_anonymous_function_of_class): New function. * ov-usr-fcn.cc (octave_user_function::octave_user_function): Initialize anonymous_function data member. (octave_user_function::profiler_name): Distinguish between inline and anonymous functions. (octave_user_function::do_multi_index_op): Use is_anonymous_function instead of checking whether cmd_list is marked as an anonymous function body. * pt-fcn-handle.cc (tree_anon_fcn_handle::rvalue1): If parent function is a class method or constructor, stash the dispatch type in the new function. Mark the new function as anonymous, not inline.
author John W. Eaton <jwe@octave.org>
date Wed, 28 Sep 2011 16:45:21 -0400
parents 34a49d076155
children 4e8f23ccadce
comparison
equal deleted inserted replaced
13240:32980cbf2338 13241:2a8dcb5b3a00
122 122
123 if (parent_scope < 0) 123 if (parent_scope < 0)
124 parent_scope = curr_fcn->scope (); 124 parent_scope = curr_fcn->scope ();
125 125
126 uf->stash_parent_fcn_scope (parent_scope); 126 uf->stash_parent_fcn_scope (parent_scope);
127
128 if (curr_fcn->is_class_method () || curr_fcn->is_class_constructor ())
129 uf->stash_dispatch_class (curr_fcn->dispatch_class ());
127 } 130 }
128 131
129 uf->mark_as_inline_function (); 132 uf->mark_as_anonymous_function ();
130 uf->stash_fcn_file_name (file_name); 133 uf->stash_fcn_file_name (file_name);
131 uf->stash_fcn_location (line (), column ()); 134 uf->stash_fcn_location (line (), column ());
132 135
133 octave_value ov_fcn (uf); 136 octave_value ov_fcn (uf);
134 137