Mercurial > hg > octave-jordi
view src/ls-utils.cc @ 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 (2011-09-28) |
parents | fd0a3ac60b0e |
children | 72c96de7a403 |
line wrap: on
line source
/* Copyright (C) 2003-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/>. */ #ifdef HAVE_CONFIG_H #include <config.h> #endif #include "data-conv.h" #include "ls-utils.h" // MAX_VAL and MIN_VAL are assumed to have integral values even though // they are stored in doubles. save_type get_save_type (double /* max_val */, double /* min_val */) { save_type st = LS_DOUBLE; // Matlab doesn't seem to load the UINT32 type correctly, so let's // avoid it (and the other unsigned types, even though they may not // have the same problem. And apparently, there are problems with // other smaller types as well. If we avoid them all, then maybe we // will avoid problems. Unfortunately, we won't be able to save // space... // if (max_val < 256 && min_val > -1) // st = LS_U_CHAR; // else if (max_val < 65536 && min_val > -1) // st = LS_U_SHORT; // else if (max_val < 4294967295UL && min_val > -1) // st = LS_U_INT; // else if (max_val < 128 && min_val >= -128) // st = LS_CHAR; // else if (max_val < 32768 && min_val >= -32768) // st = LS_SHORT; // else if (max_val <= 2147483647L && min_val >= -2147483647L) // st = LS_INT; return st; } save_type get_save_type (float /* max_val */, float /* min_val */) { save_type st = LS_FLOAT; // Matlab doesn't seem to load the UINT32 type correctly, so let's // avoid it (and the other unsigned types, even though they may not // have the same problem. And apparently, there are problems with // other smaller types as well. If we avoid them all, then maybe we // will avoid problems. Unfortunately, we won't be able to save // space... // if (max_val < 256 && min_val > -1) // st = LS_U_CHAR; // else if (max_val < 65536 && min_val > -1) // st = LS_U_SHORT; // else if (max_val < 4294967295UL && min_val > -1) // st = LS_U_INT; // else if (max_val < 128 && min_val >= -128) // st = LS_CHAR; // else if (max_val < 32768 && min_val >= -32768) // st = LS_SHORT; // else if (max_val <= 2147483647L && min_val >= -2147483647L) // st = LS_INT; return st; }