Mercurial > hg > octave-lyh
view src/ov-fcn-inline.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) 2004-2011 David Bateman 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_fcn_inline_h) #define octave_fcn_inline_h 1 #include <iosfwd> #include <string> #include "oct-alloc.h" #include "ov-base.h" #include "ov-base-mat.h" #include "ov-fcn.h" #include "ov-typeinfo.h" #include "symtab.h" #include "ov-fcn-handle.h" // Inline functions. class OCTINTERP_API octave_fcn_inline : public octave_fcn_handle { public: octave_fcn_inline (void) : octave_fcn_handle (), iftext (), ifargs () { } octave_fcn_inline (const std::string& f, const string_vector& a, const std::string& n = std::string ()); octave_fcn_inline (const octave_fcn_inline& fi) : octave_fcn_handle (fi), iftext (fi.iftext), ifargs (fi.ifargs) { } ~octave_fcn_inline (void) { } octave_base_value *clone (void) const { return new octave_fcn_inline (*this); } octave_base_value *empty_clone (void) const { return new octave_fcn_inline (); } bool is_inline_function (void) const { return true; } octave_fcn_inline *fcn_inline_value (bool = false) { return this; } std::string fcn_text (void) const { return iftext; } string_vector fcn_arg_names (void) const { return ifargs; } octave_value convert_to_str_internal (bool, bool, char) const; octave_map map_value (void) const; bool save_ascii (std::ostream& os); bool load_ascii (std::istream& is); bool save_binary (std::ostream& os, bool& save_as_floats); bool load_binary (std::istream& is, bool swap, oct_mach_info::float_format fmt); #if defined (HAVE_HDF5) bool save_hdf5 (hid_t loc_id, const char *name, bool save_as_floats); bool load_hdf5 (hid_t loc_id, const char *name); #endif void print (std::ostream& os, bool pr_as_read_syntax = false) const; void print_raw (std::ostream& os, bool pr_as_read_syntax = false) const; private: DECLARE_OCTAVE_ALLOCATOR DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA // The expression of an inline function. std::string iftext; // The args of an inline function. string_vector ifargs; }; #endif