Mercurial > hg > octave-nkf
view src/pt-cbinop.h @ 13241:2a8dcb5b3a00
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 | f4689107dd8c |
children | 72c96de7a403 |
line wrap: on
line source
/* Copyright (C) 2008-2011 Jaroslav Hajek This file is part of Octave. Octave is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. Octave is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with Octave; see the file COPYING. If not, see <http://www.gnu.org/licenses/>. */ #if !defined (octave_tree_cbinop_h) #define octave_tree_cbinop_h 1 #include <string> class tree_walker; class octave_value; class octave_value_list; class octave_lvalue; #include "ov.h" #include "pt-binop.h" #include "symtab.h" // Binary expressions that can be reduced to compound operations class tree_compound_binary_expression : public tree_binary_expression { public: tree_compound_binary_expression (tree_expression *a, tree_expression *b, int l, int c, octave_value::binary_op t, tree_expression *ca, tree_expression *cb, octave_value::compound_binary_op ct) : tree_binary_expression (a, b, l, c, t), op_lhs (ca), op_rhs (cb), etype (ct) { } octave_value rvalue1 (int nargout = 1); octave_value::compound_binary_op cop_type (void) const { return etype; } private: tree_expression *op_lhs; tree_expression *op_rhs; octave_value::compound_binary_op etype; // No copying! tree_compound_binary_expression (const tree_compound_binary_expression&); tree_compound_binary_expression& operator = (const tree_compound_binary_expression&); }; // a "virtual constructor" tree_binary_expression * maybe_compound_binary_expression (tree_expression *a, tree_expression *b, int l = -1, int c = -1, octave_value::binary_op t = octave_value::unknown_binary_op); #endif