Mercurial > hg > octave-lyh
view src/ov-re-diag.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) 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_diag_matrix_h) #define octave_diag_matrix_h 1 #include "ov-base.h" #include "ov-base-diag.h" #include "ov-re-mat.h" #include "ov-typeinfo.h" // Real diagonal matrix values. class OCTINTERP_API octave_diag_matrix : public octave_base_diag<DiagMatrix, Matrix> { public: octave_diag_matrix (void) : octave_base_diag<DiagMatrix, Matrix> () { } octave_diag_matrix (const DiagMatrix& m) : octave_base_diag<DiagMatrix, Matrix> (m) { } octave_diag_matrix (const octave_diag_matrix& m) : octave_base_diag<DiagMatrix, Matrix> (m) { } ~octave_diag_matrix (void) { } octave_base_value *clone (void) const { return new octave_diag_matrix (*this); } octave_base_value *empty_clone (void) const { return new octave_diag_matrix (); } type_conv_info numeric_conversion_function (void) const; type_conv_info numeric_demotion_function (void) const; octave_base_value *try_narrowing_conversion (void); octave_value do_index_op (const octave_value_list& idx, bool resize_ok = false); builtin_type_t builtin_type (void) const { return btyp_double; } bool is_real_matrix (void) const { return true; } bool is_real_type (void) const { return true; } bool is_double_type (void) const { return true; } bool is_float_type (void) const { return true; } DiagMatrix diag_matrix_value (bool = false) const; FloatDiagMatrix float_diag_matrix_value (bool = false) const; ComplexDiagMatrix complex_diag_matrix_value (bool = false) const; FloatComplexDiagMatrix float_complex_diag_matrix_value (bool = false) const; bool save_binary (std::ostream& os, bool& save_as_floats); bool load_binary (std::istream& is, bool swap, oct_mach_info::float_format fmt); octave_value map (unary_mapper_t umap) const; private: bool chk_valid_scalar (const octave_value&, double&) const; DECLARE_OCTAVE_ALLOCATOR DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA }; #endif