Mercurial > hg > octave-nkf
view src/pt-mat.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 | 12df7854fa7c |
children | 72c96de7a403 |
line wrap: on
line source
/* Copyright (C) 1996-2011 John W. Eaton 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_mat_h) #define octave_tree_mat_h 1 #include <iosfwd> class octave_value; class octave_value_list; class tree_argument_list; class tree_walker; #include "base-list.h" #include "pt-exp.h" #include "symtab.h" // General matrices. This allows us to construct matrices from // other matrices, variables, and functions. class tree_matrix : public tree_expression, public octave_base_list<tree_argument_list *> { public: tree_matrix (tree_argument_list *row = 0, int l = -1, int c = -1) : tree_expression (l, c) { if (row) append (row); } ~tree_matrix (void); bool has_magic_end (void) const; bool all_elements_are_constant (void) const; bool rvalue_ok (void) const { return true; } octave_value rvalue1 (int nargout = 1); octave_value_list rvalue (int nargout); tree_expression *dup (symbol_table::scope_id scope, symbol_table::context_id context) const; void accept (tree_walker& tw); private: // No copying! tree_matrix (const tree_matrix&); tree_matrix& operator = (const tree_matrix&); }; // The character to fill with when creating string arrays. extern char Vstring_fill_char; extern std::string get_concat_class (const std::string& c1, const std::string& c2); extern void maybe_warn_string_concat (bool all_dq_strings_p, bool all_sq_strings_p); extern std::string get_concat_class (const std::string& c1, const std::string& c2); extern void maybe_warn_string_concat (bool all_dq_strings_p, bool all_sq_strings_p); #endif