octave: libinterp/octave-value/ov-fcn-handle.cc annotate

annotate libinterp/octave-value/ov-fcn-handle.cc @ 24108:1a53f0c855db

move some duplicate code into a separate function * ov-fcn-handle.h, ov-fcn-handle.cc (octave_fcn_handle::parse_anon_fcn_hanlde): New function. (octave_fcn_handle::load_ascii, octave_fcn_handle::load_binary, octave_fcn_handle::load_hdf5): Use it to eliminate duplicate code.

author	John W. Eaton <jwe@octave.org>
date	Wed, 27 Sep 2017 15:56:39 -0400
parents	01899bdd2a3a
children	bc3819b7cca1

rev	line source
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1 /*
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	2
23219 3ac9f9ecfae5 maint: Update copyright dates. John W. Eaton <jwe@octave.org> parents: 23083 diff changeset	3 Copyright (C) 2003-2017 John W. Eaton
9601 a9b37bae1802 add a couple of missing copyright statements Jaroslav Hajek <highegg@gmail.com> parents: 9509 diff changeset	4 Copyright (C) 2009 VZLU Prague, a.s.
10960 409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	5 Copyright (C) 2010 Jaroslav Hajek
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	6
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	7 This file is part of Octave.
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	8
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	9 Octave is free software; you can redistribute it and/or modify it
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22653 diff changeset	10 under the terms of the GNU General Public License as published by
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22653 diff changeset	11 the Free Software Foundation; either version 3 of the License, or
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22653 diff changeset	12 (at your option) any later version.
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	13
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22653 diff changeset	14 Octave is distributed in the hope that it will be useful, but
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22653 diff changeset	15 WITHOUT ANY WARRANTY; without even the implied warranty of
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22653 diff changeset	16 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22653 diff changeset	17 GNU General Public License for more details.
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	18
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	19 You should have received a copy of the GNU General Public License
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6974 diff changeset	20 along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6974 diff changeset	21 <http://www.gnu.org/licenses/>.
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	22
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	23 */
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	24
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21691 diff changeset	25 #if defined (HAVE_CONFIG_H)
21301 40de9f8f23a6 Use '#include "config.h"' rather than <config.h>. Rik <rik@octave.org> parents: 21211 diff changeset	26 # include "config.h"
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	27 #endif
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	28
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	29 #include <iostream>
21867 0cdfd6d230e6 use std::list<std::string> instead of string_vector in pathsearch functions John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	30 #include <list>
5765 7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5760 diff changeset	31 #include <sstream>
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: 5105 diff changeset	32 #include <vector>
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	33
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	34 #include "file-ops.h"
8377 25bc2d31e1bf improve OCTAVE_LOCAL_BUFFER Jaroslav Hajek <highegg@gmail.com> parents: 8021 diff changeset	35 #include "oct-locbuf.h"
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	36
22091 0f6fc2ec3b1a move call_stack class to a separate file John W. Eaton <jwe@octave.org> parents: 22028 diff changeset	37 #include "call-stack.h"
23127 5a91168a30be avoid including parse tree headers in other header files unnecessarily John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	38 #include "defaults.h"
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	39 #include "defun.h"
4654 a9b22513b7a6 [project @ 2003-11-24 18:56:35 by jwe] jwe parents: 4649 diff changeset	40 #include "error.h"
21100 e39e05d90788 Switch gripe_XXX to either err_XXX or warn_XXX naming scheme. Rik <rik@octave.org> parents: 21079 diff changeset	41 #include "errwarn.h"
23127 5a91168a30be avoid including parse tree headers in other header files unnecessarily John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	42 #include "file-stat.h"
5663 775e065f7dc4 [project @ 2006-03-13 21:30:06 by jwe] jwe parents: 5313 diff changeset	43 #include "input.h"
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	44 #include "interpreter-private.h"
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: 22091 diff changeset	45 #include "interpreter.h"
23127 5a91168a30be avoid including parse tree headers in other header files unnecessarily John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	46 #include "load-path.h"
5a91168a30be avoid including parse tree headers in other header files unnecessarily John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	47 #include "oct-env.h"
19863 09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	48 #include "oct-hdf5.h"
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	49 #include "oct-map.h"
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	50 #include "ov-base.h"
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	51 #include "ov-fcn-handle.h"
4980 003bbf6c13d8 [project @ 2004-09-09 15:47:17 by jwe] jwe parents: 4978 diff changeset	52 #include "ov-usr-fcn.h"
23127 5a91168a30be avoid including parse tree headers in other header files unnecessarily John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	53 #include "parse.h"
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	54 #include "pr-output.h"
23127 5a91168a30be avoid including parse tree headers in other header files unnecessarily John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	55 #include "pt-arg-list.h"
5a91168a30be avoid including parse tree headers in other header files unnecessarily John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	56 #include "pt-assign.h"
4980 003bbf6c13d8 [project @ 2004-09-09 15:47:17 by jwe] jwe parents: 4978 diff changeset	57 #include "pt-cmd.h"
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23433 diff changeset	58 #include "pt-eval.h"
4980 003bbf6c13d8 [project @ 2004-09-09 15:47:17 by jwe] jwe parents: 4978 diff changeset	59 #include "pt-exp.h"
23127 5a91168a30be avoid including parse tree headers in other header files unnecessarily John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	60 #include "pt-idx.h"
5a91168a30be avoid including parse tree headers in other header files unnecessarily John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	61 #include "pt-misc.h"
5a91168a30be avoid including parse tree headers in other header files unnecessarily John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	62 #include "pt-pr-code.h"
5a91168a30be avoid including parse tree headers in other header files unnecessarily John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	63 #include "pt-stmt.h"
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	64 #include "unwind-prot.h"
23127 5a91168a30be avoid including parse tree headers in other header files unnecessarily John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	65 #include "variables.h"
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	66
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	67 #include "byte-swap.h"
8946 e7e928088e90 fix CRLF issues with text-mode reading in windows when loading ascii data Benjamin Lindner <lindnerb@users.sourceforge.net> parents: 8920 diff changeset	68 #include "ls-ascii-helper.h"
e7e928088e90 fix CRLF issues with text-mode reading in windows when loading ascii data Benjamin Lindner <lindnerb@users.sourceforge.net> parents: 8920 diff changeset	69 #include "ls-hdf5.h"
20447 c6224b4e7774 maint: Rename instances of LS_ASCII to LS_TEXT for clarity. Rik <rik@octave.org> parents: 20435 diff changeset	70 #include "ls-oct-text.h"
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	71 #include "ls-oct-binary.h"
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	72 #include "ls-utils.h"
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	73
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	74
4612 d44675070f1a [project @ 2003-11-14 19:49:56 by jwe] jwe parents: 4346 diff changeset	75 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_fcn_handle,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	76 "function handle",
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	77 "function_handle");
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	78
10261 a4fb4675accb make printing of handles more Matlab-compatible Jaroslav Hajek <highegg@gmail.com> parents: 10250 diff changeset	79 const std::string octave_fcn_handle::anonymous ("@<anonymous>");
a4fb4675accb make printing of handles more Matlab-compatible Jaroslav Hajek <highegg@gmail.com> parents: 10250 diff changeset	80
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7756 diff changeset	81 octave_fcn_handle::octave_fcn_handle (const octave_value& f,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	82 const std::string& n)
10321 97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	83 : fcn (f), nm (n), has_overloads (false)
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7756 diff changeset	84 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7756 diff changeset	85 octave_user_function *uf = fcn.user_function_value (true);
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7756 diff changeset	86
10261 a4fb4675accb make printing of handles more Matlab-compatible Jaroslav Hajek <highegg@gmail.com> parents: 10250 diff changeset	87 if (uf && nm != anonymous)
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23573 diff changeset	88 {
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	89 octave::symbol_table::scope *uf_scope = uf->scope ();
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23573 diff changeset	90
23611 91c8f006ed8b remove additional functions from symbol_table class John W. Eaton <jwe@octave.org> parents: 23603 diff changeset	91 if (uf_scope)
91c8f006ed8b remove additional functions from symbol_table class John W. Eaton <jwe@octave.org> parents: 23603 diff changeset	92 uf_scope->cache_name (nm);
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23573 diff changeset	93 }
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	94
22974 ecc5eeada8dc Don't mark nested functions in primary function as subfunctions. Rik <rik@octave.org> parents: 22871 diff changeset	95 if (uf && uf->is_nested_function () && ! uf->is_subfunction ())
20428 7ac907da9fba Use error() rather than ::error() unless explicitly required. Rik <rik@octave.org> parents: 20163 diff changeset	96 error ("handles to nested functions are not yet supported");
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7756 diff changeset	97 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7756 diff changeset	98
4924 9a3a32f5a27d [project @ 2004-08-02 19:04:20 by jwe] jwe parents: 4675 diff changeset	99 octave_value_list
9a3a32f5a27d [project @ 2004-08-02 19:04:20 by jwe] jwe parents: 4675 diff changeset	100 octave_fcn_handle::subsref (const std::string& type,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	101 const std::list<octave_value_list>& idx,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	102 int nargout)
4924 9a3a32f5a27d [project @ 2004-08-02 19:04:20 by jwe] jwe parents: 4675 diff changeset	103 {
9a3a32f5a27d [project @ 2004-08-02 19:04:20 by jwe] jwe parents: 4675 diff changeset	104 octave_value_list retval;
9a3a32f5a27d [project @ 2004-08-02 19:04:20 by jwe] jwe parents: 4675 diff changeset	105
9a3a32f5a27d [project @ 2004-08-02 19:04:20 by jwe] jwe parents: 4675 diff changeset	106 switch (type[0])
9a3a32f5a27d [project @ 2004-08-02 19:04:20 by jwe] jwe parents: 4675 diff changeset	107 {
9a3a32f5a27d [project @ 2004-08-02 19:04:20 by jwe] jwe parents: 4675 diff changeset	108 case '(':
9a3a32f5a27d [project @ 2004-08-02 19:04:20 by jwe] jwe parents: 4675 diff changeset	109 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	110 int tmp_nargout = (type.length () > 1 && nargout == 0) ? 1 : nargout;
5663 775e065f7dc4 [project @ 2006-03-13 21:30:06 by jwe] jwe parents: 5313 diff changeset	111
23502 c6714ae1c06c eliminate remaining do_multi_index_op methods John W. Eaton <jwe@octave.org> parents: 23501 diff changeset	112 retval = call (tmp_nargout, idx.front ());
4924 9a3a32f5a27d [project @ 2004-08-02 19:04:20 by jwe] jwe parents: 4675 diff changeset	113 }
9a3a32f5a27d [project @ 2004-08-02 19:04:20 by jwe] jwe parents: 4675 diff changeset	114 break;
9a3a32f5a27d [project @ 2004-08-02 19:04:20 by jwe] jwe parents: 4675 diff changeset	115
9a3a32f5a27d [project @ 2004-08-02 19:04:20 by jwe] jwe parents: 4675 diff changeset	116 case '{':
9a3a32f5a27d [project @ 2004-08-02 19:04:20 by jwe] jwe parents: 4675 diff changeset	117 case '.':
9a3a32f5a27d [project @ 2004-08-02 19:04:20 by jwe] jwe parents: 4675 diff changeset	118 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	119 std::string tnm = type_name ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	120 error ("%s cannot be indexed with %c", tnm.c_str (), type[0]);
4924 9a3a32f5a27d [project @ 2004-08-02 19:04:20 by jwe] jwe parents: 4675 diff changeset	121 }
9a3a32f5a27d [project @ 2004-08-02 19:04:20 by jwe] jwe parents: 4675 diff changeset	122 break;
9a3a32f5a27d [project @ 2004-08-02 19:04:20 by jwe] jwe parents: 4675 diff changeset	123
9a3a32f5a27d [project @ 2004-08-02 19:04:20 by jwe] jwe parents: 4675 diff changeset	124 default:
9a3a32f5a27d [project @ 2004-08-02 19:04:20 by jwe] jwe parents: 4675 diff changeset	125 panic_impossible ();
9a3a32f5a27d [project @ 2004-08-02 19:04:20 by jwe] jwe parents: 4675 diff changeset	126 }
9a3a32f5a27d [project @ 2004-08-02 19:04:20 by jwe] jwe parents: 4675 diff changeset	127
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	128 // FIXME: perhaps there should be an
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9419 diff changeset	129 // octave_value_list::next_subsref member function? See also
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9419 diff changeset	130 // octave_builtin::subsref.
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9419 diff changeset	131
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9419 diff changeset	132 if (idx.size () > 1)
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9419 diff changeset	133 retval = retval(0).next_subsref (nargout, type, idx);
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9419 diff changeset	134
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9419 diff changeset	135 return retval;
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9419 diff changeset	136 }
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9419 diff changeset	137
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9419 diff changeset	138 octave_value_list
23502 c6714ae1c06c eliminate remaining do_multi_index_op methods John W. Eaton <jwe@octave.org> parents: 23501 diff changeset	139 octave_fcn_handle::call (int nargout, const octave_value_list& args)
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9419 diff changeset	140 {
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9419 diff changeset	141 octave_value_list retval;
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9419 diff changeset	142
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	143 octave::out_of_date_check (fcn, "", false);
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9419 diff changeset	144
10321 97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	145 if (has_overloads)
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9419 diff changeset	146 {
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9419 diff changeset	147 // Possibly overloaded function.
10321 97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	148 octave_value ov_fcn;
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9419 diff changeset	149
10321 97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	150 // Compute dispatch type.
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	151 builtin_type_t btyp;
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	152 std::string dispatch_type = octave::get_dispatch_type (args, btyp);
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9419 diff changeset	153
10321 97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	154 // Retrieve overload.
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	155 if (btyp != btyp_unknown)
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9419 diff changeset	156 {
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	157 octave::out_of_date_check (builtin_overloads[btyp], dispatch_type, false);
10321 97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	158 ov_fcn = builtin_overloads[btyp];
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	159 }
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	160 else
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	161 {
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	162 str_ov_map::iterator it = overloads.find (dispatch_type);
13193 a00ff5cedb9b also look to parent classes for overloaded functions called through handles John W. Eaton <jwe@octave.org> parents: 12714 diff changeset	163
a00ff5cedb9b also look to parent classes for overloaded functions called through handles John W. Eaton <jwe@octave.org> parents: 12714 diff changeset	164 if (it == overloads.end ())
a00ff5cedb9b also look to parent classes for overloaded functions called through handles John W. Eaton <jwe@octave.org> parents: 12714 diff changeset	165 {
a00ff5cedb9b also look to parent classes for overloaded functions called through handles John W. Eaton <jwe@octave.org> parents: 12714 diff changeset	166 // Try parent classes too.
a00ff5cedb9b also look to parent classes for overloaded functions called through handles John W. Eaton <jwe@octave.org> parents: 12714 diff changeset	167
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	168 octave::symbol_table& symtab
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23573 diff changeset	169 = octave::__get_symbol_table__ ("octave_fcn_handle::call");
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23573 diff changeset	170
13193 a00ff5cedb9b also look to parent classes for overloaded functions called through handles John W. Eaton <jwe@octave.org> parents: 12714 diff changeset	171 std::list<std::string> plist
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23573 diff changeset	172 = symtab.parent_classes (dispatch_type);
13193 a00ff5cedb9b also look to parent classes for overloaded functions called through handles John W. Eaton <jwe@octave.org> parents: 12714 diff changeset	173
a00ff5cedb9b also look to parent classes for overloaded functions called through handles John W. Eaton <jwe@octave.org> parents: 12714 diff changeset	174 std::list<std::string>::const_iterator pit = plist.begin ();
a00ff5cedb9b also look to parent classes for overloaded functions called through handles John W. Eaton <jwe@octave.org> parents: 12714 diff changeset	175
a00ff5cedb9b also look to parent classes for overloaded functions called through handles John W. Eaton <jwe@octave.org> parents: 12714 diff changeset	176 while (pit != plist.end ())
a00ff5cedb9b also look to parent classes for overloaded functions called through handles John W. Eaton <jwe@octave.org> parents: 12714 diff changeset	177 {
a00ff5cedb9b also look to parent classes for overloaded functions called through handles John W. Eaton <jwe@octave.org> parents: 12714 diff changeset	178 std::string pname = *pit;
a00ff5cedb9b also look to parent classes for overloaded functions called through handles John W. Eaton <jwe@octave.org> parents: 12714 diff changeset	179
a00ff5cedb9b also look to parent classes for overloaded functions called through handles John W. Eaton <jwe@octave.org> parents: 12714 diff changeset	180 std::string fnm = fcn_name ();
a00ff5cedb9b also look to parent classes for overloaded functions called through handles John W. Eaton <jwe@octave.org> parents: 12714 diff changeset	181
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23573 diff changeset	182 octave_value ftmp = symtab.find_method (fnm, pname);
13193 a00ff5cedb9b also look to parent classes for overloaded functions called through handles John W. Eaton <jwe@octave.org> parents: 12714 diff changeset	183
a00ff5cedb9b also look to parent classes for overloaded functions called through handles John W. Eaton <jwe@octave.org> parents: 12714 diff changeset	184 if (ftmp.is_defined ())
a00ff5cedb9b also look to parent classes for overloaded functions called through handles John W. Eaton <jwe@octave.org> parents: 12714 diff changeset	185 {
a00ff5cedb9b also look to parent classes for overloaded functions called through handles John W. Eaton <jwe@octave.org> parents: 12714 diff changeset	186 set_overload (pname, ftmp);
a00ff5cedb9b also look to parent classes for overloaded functions called through handles John W. Eaton <jwe@octave.org> parents: 12714 diff changeset	187
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	188 octave::out_of_date_check (ftmp, pname, false);
13193 a00ff5cedb9b also look to parent classes for overloaded functions called through handles John W. Eaton <jwe@octave.org> parents: 12714 diff changeset	189 ov_fcn = ftmp;
a00ff5cedb9b also look to parent classes for overloaded functions called through handles John W. Eaton <jwe@octave.org> parents: 12714 diff changeset	190
a00ff5cedb9b also look to parent classes for overloaded functions called through handles John W. Eaton <jwe@octave.org> parents: 12714 diff changeset	191 break;
a00ff5cedb9b also look to parent classes for overloaded functions called through handles John W. Eaton <jwe@octave.org> parents: 12714 diff changeset	192 }
a00ff5cedb9b also look to parent classes for overloaded functions called through handles John W. Eaton <jwe@octave.org> parents: 12714 diff changeset	193
a00ff5cedb9b also look to parent classes for overloaded functions called through handles John W. Eaton <jwe@octave.org> parents: 12714 diff changeset	194 pit++;
a00ff5cedb9b also look to parent classes for overloaded functions called through handles John W. Eaton <jwe@octave.org> parents: 12714 diff changeset	195 }
a00ff5cedb9b also look to parent classes for overloaded functions called through handles John W. Eaton <jwe@octave.org> parents: 12714 diff changeset	196 }
a00ff5cedb9b also look to parent classes for overloaded functions called through handles John W. Eaton <jwe@octave.org> parents: 12714 diff changeset	197 else
9466 2ebd0717c12d also cache class dispatch lookups in function handles Jaroslav Hajek <highegg@gmail.com> parents: 9463 diff changeset	198 {
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	199 octave::out_of_date_check (it->second, dispatch_type, false);
10321 97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	200 ov_fcn = it->second;
9466 2ebd0717c12d also cache class dispatch lookups in function handles Jaroslav Hajek <highegg@gmail.com> parents: 9463 diff changeset	201 }
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9419 diff changeset	202 }
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9419 diff changeset	203
10321 97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	204 if (ov_fcn.is_defined ())
23501 1ee4b394a687 use feval instead of do_multi_index_op John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	205 retval = octave::feval (ov_fcn, args, nargout);
10321 97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	206 else if (fcn.is_defined ())
23501 1ee4b394a687 use feval instead of do_multi_index_op John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	207 retval = octave::feval (fcn, args, nargout);
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9419 diff changeset	208 else
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	209 error ("%s: no method for class %s",
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	210 nm.c_str (), dispatch_type.c_str ());
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9419 diff changeset	211 }
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9419 diff changeset	212 else
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9419 diff changeset	213 {
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9419 diff changeset	214 // Non-overloaded function (anonymous, subfunction, private function).
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9419 diff changeset	215 if (fcn.is_defined ())
23501 1ee4b394a687 use feval instead of do_multi_index_op John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	216 retval = octave::feval (fcn, args, nargout);
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9419 diff changeset	217 else
10321 97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	218 error ("%s: no longer valid function handle", nm.c_str ());
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9419 diff changeset	219 }
4924 9a3a32f5a27d [project @ 2004-08-02 19:04:20 by jwe] jwe parents: 4675 diff changeset	220
9a3a32f5a27d [project @ 2004-08-02 19:04:20 by jwe] jwe parents: 4675 diff changeset	221 return retval;
9a3a32f5a27d [project @ 2004-08-02 19:04:20 by jwe] jwe parents: 4675 diff changeset	222 }
9a3a32f5a27d [project @ 2004-08-02 19:04:20 by jwe] jwe parents: 4675 diff changeset	223
21573 f3f8e1d3e399 avoid mulitple definitions of static function-scope vars (bug #47372) John W. Eaton <jwe@octave.org> parents: 20496 diff changeset	224 dim_vector
f3f8e1d3e399 avoid mulitple definitions of static function-scope vars (bug #47372) John W. Eaton <jwe@octave.org> parents: 20496 diff changeset	225 octave_fcn_handle::dims (void) const
f3f8e1d3e399 avoid mulitple definitions of static function-scope vars (bug #47372) John W. Eaton <jwe@octave.org> parents: 20496 diff changeset	226 {
f3f8e1d3e399 avoid mulitple definitions of static function-scope vars (bug #47372) John W. Eaton <jwe@octave.org> parents: 20496 diff changeset	227 static dim_vector dv (1, 1);
f3f8e1d3e399 avoid mulitple definitions of static function-scope vars (bug #47372) John W. Eaton <jwe@octave.org> parents: 20496 diff changeset	228 return dv;
f3f8e1d3e399 avoid mulitple definitions of static function-scope vars (bug #47372) John W. Eaton <jwe@octave.org> parents: 20496 diff changeset	229 }
f3f8e1d3e399 avoid mulitple definitions of static function-scope vars (bug #47372) John W. Eaton <jwe@octave.org> parents: 20496 diff changeset	230
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11541 diff changeset	231 bool
10322 21551cc88061 improve function handles comparison Jaroslav Hajek <highegg@gmail.com> parents: 10321 diff changeset	232 octave_fcn_handle::is_equal_to (const octave_fcn_handle& h) const
21551cc88061 improve function handles comparison Jaroslav Hajek <highegg@gmail.com> parents: 10321 diff changeset	233 {
21551cc88061 improve function handles comparison Jaroslav Hajek <highegg@gmail.com> parents: 10321 diff changeset	234 bool retval = fcn.is_copy_of (h.fcn) && (has_overloads == h.has_overloads);
21551cc88061 improve function handles comparison Jaroslav Hajek <highegg@gmail.com> parents: 10321 diff changeset	235 retval = retval && (overloads.size () == h.overloads.size ());
21551cc88061 improve function handles comparison Jaroslav Hajek <highegg@gmail.com> parents: 10321 diff changeset	236
21551cc88061 improve function handles comparison Jaroslav Hajek <highegg@gmail.com> parents: 10321 diff changeset	237 if (retval && has_overloads)
21551cc88061 improve function handles comparison Jaroslav Hajek <highegg@gmail.com> parents: 10321 diff changeset	238 {
21551cc88061 improve function handles comparison Jaroslav Hajek <highegg@gmail.com> parents: 10321 diff changeset	239 for (int i = 0; i < btyp_num_types && retval; i++)
21551cc88061 improve function handles comparison Jaroslav Hajek <highegg@gmail.com> parents: 10321 diff changeset	240 retval = builtin_overloads[i].is_copy_of (h.builtin_overloads[i]);
21551cc88061 improve function handles comparison Jaroslav Hajek <highegg@gmail.com> parents: 10321 diff changeset	241
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	242 str_ov_map::const_iterator iter = overloads.begin ();
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	243 str_ov_map::const_iterator hiter = h.overloads.begin ();
10322 21551cc88061 improve function handles comparison Jaroslav Hajek <highegg@gmail.com> parents: 10321 diff changeset	244 for (; iter != overloads.end () && retval; iter++, hiter++)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	245 retval = (iter->first == hiter->first)
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	246 && (iter->second.is_copy_of (hiter->second));
10322 21551cc88061 improve function handles comparison Jaroslav Hajek <highegg@gmail.com> parents: 10321 diff changeset	247 }
21551cc88061 improve function handles comparison Jaroslav Hajek <highegg@gmail.com> parents: 10321 diff changeset	248
21551cc88061 improve function handles comparison Jaroslav Hajek <highegg@gmail.com> parents: 10321 diff changeset	249 return retval;
21551cc88061 improve function handles comparison Jaroslav Hajek <highegg@gmail.com> parents: 10321 diff changeset	250 }
21551cc88061 improve function handles comparison Jaroslav Hajek <highegg@gmail.com> parents: 10321 diff changeset	251
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	252 bool
23433 c9fab0bc983e maint: Use convention 'int& x' for naming references. Rik <rik@octave.org> parents: 23220 diff changeset	253 octave_fcn_handle::set_fcn (const std::string& octaveroot,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	254 const std::string& fpath)
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	255 {
7745 0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7744 diff changeset	256 if (octaveroot.length () != 0
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7744 diff changeset	257 && fpath.length () >= octaveroot.length ()
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7744 diff changeset	258 && fpath.substr (0, octaveroot.length ()) == octaveroot
23717 06579337237b move configuration variables inside octave::config namespace John W. Eaton <jwe@octave.org> parents: 23712 diff changeset	259 && octave::config::octave_exec_home () != octaveroot)
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	260 {
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	261 // First check if just replacing matlabroot is enough
23712 b95c430c0649 revamp insertion of config variables into binaries and eliminate some macros John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	262 std::string str
23717 06579337237b move configuration variables inside octave::config namespace John W. Eaton <jwe@octave.org> parents: 23712 diff changeset	263 = (octave::config::octave_exec_home ()
06579337237b move configuration variables inside octave::config namespace John W. Eaton <jwe@octave.org> parents: 23712 diff changeset	264 + fpath.substr (octaveroot.length ()));
21736 0504351a45e6 use namespace for file_stat classes John W. Eaton <jwe@octave.org> parents: 21733 diff changeset	265 octave::sys::file_stat fs (str);
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	266
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	267 if (fs.exists ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	268 {
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	269 size_t xpos = str.find_last_of (octave::sys::file_ops::dir_sep_chars ());
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	270
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	271 std::string dir_name = str.substr (0, xpos);
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	272
23653 3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	273 octave_value ov_fcn
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	274 = octave::load_fcn_from_file (str, dir_name, "", "", nm);
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	275
23653 3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	276 if (ov_fcn.is_undefined ())
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20957 diff changeset	277 error ("function handle points to non-existent function");
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	278
23653 3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	279 fcn = octave_value (new octave_fcn_handle (ov_fcn, nm));
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	280 }
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	281 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	282 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	283 // Next just search for it anywhere in the system path
21867 0cdfd6d230e6 use std::list<std::string> instead of string_vector in pathsearch functions John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	284 std::list<std::string> names;
0cdfd6d230e6 use std::list<std::string> instead of string_vector in pathsearch functions John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	285 names.push_back (nm + ".oct");
0cdfd6d230e6 use std::list<std::string> instead of string_vector in pathsearch functions John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	286 names.push_back (nm + ".mex");
0cdfd6d230e6 use std::list<std::string> instead of string_vector in pathsearch functions John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	287 names.push_back (nm + ".m");
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	288
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	289 octave::load_path& lp = octave::__get_load_path__ ("octave_fcn_handle::set_fcn");
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	290
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	291 octave::directory_path p (lp.system_path ());
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	292
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	293 str = octave::sys::env::make_absolute (p.find_first_of (names));
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	294
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	295 size_t xpos = str.find_last_of (octave::sys::file_ops::dir_sep_chars ());
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	296
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	297 std::string dir_name = str.substr (0, xpos);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	298
23653 3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	299 octave_value ov_fcn
3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	300 = octave::load_fcn_from_file (str, dir_name, "", "", nm);
4989 19b73a80e1d9 [project @ 2004-09-11 13:31:43 by jwe] jwe parents: 4988 diff changeset	301
23653 3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	302 if (ov_fcn.is_undefined ())
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20957 diff changeset	303 error ("function handle points to non-existent function");
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	304
23653 3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	305 fcn = octave_value (new octave_fcn_handle (ov_fcn, nm));
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	306 }
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	307 }
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	308 else
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	309 {
15005 74c7265c057a fix failure with function handles caused by changeset ea6997657614 John W. Eaton <jwe@octave.org> parents: 15004 diff changeset	310 if (fpath.length () > 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	311 {
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	312 size_t xpos = fpath.find_last_of (octave::sys::file_ops::dir_sep_chars ());
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	313
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	314 std::string dir_name = fpath.substr (0, xpos);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	315
23653 3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	316 octave_value ov_fcn
3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	317 = octave::load_fcn_from_file (fpath, dir_name, "", "", nm);
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	318
23653 3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	319 if (ov_fcn.is_undefined ())
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20957 diff changeset	320 error ("function handle points to non-existent function");
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	321
23653 3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	322 fcn = octave_value (new octave_fcn_handle (ov_fcn, nm));
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	323 }
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	324 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	325 {
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	326 octave::symbol_table& symtab
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23573 diff changeset	327 = octave::__get_symbol_table__ ("octave_fcn_handle::set_fcn");
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23573 diff changeset	328
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23573 diff changeset	329 fcn = symtab.find_function (nm);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	330
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	331 if (! fcn.is_function ())
20953 758b71e964ce maint: Eliminate more useless statements after error(). Rik <rik@octave.org> parents: 20952 diff changeset	332 error ("function handle points to non-existent function");
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	333 }
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	334 }
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	335
21124 95f8c8cdbffe maint: Eliminate 'bool success' variable where possible. Rik <rik@octave.org> parents: 21102 diff changeset	336 return true;
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	337 }
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	338
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	339 bool
6974 9e32bb109980 [project @ 2007-10-08 11:06:47 by jwe] jwe parents: 6695 diff changeset	340 octave_fcn_handle::save_ascii (std::ostream& os)
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	341 {
10261 a4fb4675accb make printing of handles more Matlab-compatible Jaroslav Hajek <highegg@gmail.com> parents: 10250 diff changeset	342 if (nm == anonymous)
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	343 {
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	344 os << nm << "\n";
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	345
4989 19b73a80e1d9 [project @ 2004-09-11 13:31:43 by jwe] jwe parents: 4988 diff changeset	346 print_raw (os, true);
19b73a80e1d9 [project @ 2004-09-11 13:31:43 by jwe] jwe parents: 4988 diff changeset	347 os << "\n";
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	348
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	349 if (fcn.is_undefined ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	350 return false;
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	351
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	352 std::list<octave::symbol_table::symbol_record> vars;
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	353
23611 91c8f006ed8b remove additional functions from symbol_table class John W. Eaton <jwe@octave.org> parents: 23603 diff changeset	354 octave_user_function *f = fcn.user_function_value ();
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	355 octave::symbol_table::scope *f_scope = f->scope ();
23611 91c8f006ed8b remove additional functions from symbol_table class John W. Eaton <jwe@octave.org> parents: 23603 diff changeset	356 if (f_scope)
91c8f006ed8b remove additional functions from symbol_table class John W. Eaton <jwe@octave.org> parents: 23603 diff changeset	357 vars = f_scope->all_variables ();
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	358
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	359 size_t varlen = vars.size ();
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	360
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	361 if (varlen > 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	362 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	363 os << "# length: " << varlen << "\n";
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	364
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22755 diff changeset	365 for (const auto& symrec : vars)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	366 {
23603 18bd46c4b79a make symbol table context info mostly local to symbol table scopes John W. Eaton <jwe@octave.org> parents: 23602 diff changeset	367 if (! save_text_data (os, symrec.varval (), symrec.name (),
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22755 diff changeset	368 false, 0))
18384 bd9d34f28b0f Use std::ostream::fail instead of unsafe implicit bool conversion (bug #41335) Mike Miller <mtmiller@ieee.org> parents: 17898 diff changeset	369 return ! os.fail ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	370 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	371 }
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	372 }
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	373 else
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	374 {
7744 14b841c47a5f handle load/save for handles to built-in functions John W. Eaton <jwe@octave.org> parents: 7740 diff changeset	375 octave_function *f = function_value ();
23450 855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23445 diff changeset	376 std::string fnm = (f ? f->fcn_file_name () : "");
7744 14b841c47a5f handle load/save for handles to built-in functions John W. Eaton <jwe@octave.org> parents: 7740 diff changeset	377
23717 06579337237b move configuration variables inside octave::config namespace John W. Eaton <jwe@octave.org> parents: 23712 diff changeset	378 os << "# octaveroot: " << octave::config::octave_exec_home () << "\n";
15005 74c7265c057a fix failure with function handles caused by changeset ea6997657614 John W. Eaton <jwe@octave.org> parents: 15004 diff changeset	379 if (! fnm.empty ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	380 os << "# path: " << fnm << "\n";
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	381 os << nm << "\n";
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	382 }
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	383
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	384 return true;
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	385 }
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	386
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	387 bool
24108 1a53f0c855db move some duplicate code into a separate function John W. Eaton <jwe@octave.org> parents: 23829 diff changeset	388 octave_fcn_handle::parse_anon_fcn_handle (const std::string& fcn_text)
1a53f0c855db move some duplicate code into a separate function John W. Eaton <jwe@octave.org> parents: 23829 diff changeset	389 {
1a53f0c855db move some duplicate code into a separate function John W. Eaton <jwe@octave.org> parents: 23829 diff changeset	390 bool success = true;
1a53f0c855db move some duplicate code into a separate function John W. Eaton <jwe@octave.org> parents: 23829 diff changeset	391
1a53f0c855db move some duplicate code into a separate function John W. Eaton <jwe@octave.org> parents: 23829 diff changeset	392 int parse_status;
1a53f0c855db move some duplicate code into a separate function John W. Eaton <jwe@octave.org> parents: 23829 diff changeset	393
1a53f0c855db move some duplicate code into a separate function John W. Eaton <jwe@octave.org> parents: 23829 diff changeset	394 octave_value anon_fcn_handle =
1a53f0c855db move some duplicate code into a separate function John W. Eaton <jwe@octave.org> parents: 23829 diff changeset	395 octave::eval_string (fcn_text, true, parse_status);
1a53f0c855db move some duplicate code into a separate function John W. Eaton <jwe@octave.org> parents: 23829 diff changeset	396
1a53f0c855db move some duplicate code into a separate function John W. Eaton <jwe@octave.org> parents: 23829 diff changeset	397 if (parse_status == 0)
1a53f0c855db move some duplicate code into a separate function John W. Eaton <jwe@octave.org> parents: 23829 diff changeset	398 {
1a53f0c855db move some duplicate code into a separate function John W. Eaton <jwe@octave.org> parents: 23829 diff changeset	399 octave_fcn_handle *fh = anon_fcn_handle.fcn_handle_value ();
1a53f0c855db move some duplicate code into a separate function John W. Eaton <jwe@octave.org> parents: 23829 diff changeset	400
1a53f0c855db move some duplicate code into a separate function John W. Eaton <jwe@octave.org> parents: 23829 diff changeset	401 if (fh)
1a53f0c855db move some duplicate code into a separate function John W. Eaton <jwe@octave.org> parents: 23829 diff changeset	402 {
1a53f0c855db move some duplicate code into a separate function John W. Eaton <jwe@octave.org> parents: 23829 diff changeset	403 fcn = fh->fcn;
1a53f0c855db move some duplicate code into a separate function John W. Eaton <jwe@octave.org> parents: 23829 diff changeset	404
1a53f0c855db move some duplicate code into a separate function John W. Eaton <jwe@octave.org> parents: 23829 diff changeset	405 octave_user_function *uf = fcn.user_function_value (true);
1a53f0c855db move some duplicate code into a separate function John W. Eaton <jwe@octave.org> parents: 23829 diff changeset	406
1a53f0c855db move some duplicate code into a separate function John W. Eaton <jwe@octave.org> parents: 23829 diff changeset	407 if (uf)
1a53f0c855db move some duplicate code into a separate function John W. Eaton <jwe@octave.org> parents: 23829 diff changeset	408 {
1a53f0c855db move some duplicate code into a separate function John W. Eaton <jwe@octave.org> parents: 23829 diff changeset	409 octave::symbol_table::scope *uf_scope = uf->scope ();
1a53f0c855db move some duplicate code into a separate function John W. Eaton <jwe@octave.org> parents: 23829 diff changeset	410
1a53f0c855db move some duplicate code into a separate function John W. Eaton <jwe@octave.org> parents: 23829 diff changeset	411 if (uf_scope)
1a53f0c855db move some duplicate code into a separate function John W. Eaton <jwe@octave.org> parents: 23829 diff changeset	412 uf_scope->cache_name (nm);
1a53f0c855db move some duplicate code into a separate function John W. Eaton <jwe@octave.org> parents: 23829 diff changeset	413 }
1a53f0c855db move some duplicate code into a separate function John W. Eaton <jwe@octave.org> parents: 23829 diff changeset	414 }
1a53f0c855db move some duplicate code into a separate function John W. Eaton <jwe@octave.org> parents: 23829 diff changeset	415 else
1a53f0c855db move some duplicate code into a separate function John W. Eaton <jwe@octave.org> parents: 23829 diff changeset	416 success = false;
1a53f0c855db move some duplicate code into a separate function John W. Eaton <jwe@octave.org> parents: 23829 diff changeset	417 }
1a53f0c855db move some duplicate code into a separate function John W. Eaton <jwe@octave.org> parents: 23829 diff changeset	418 else
1a53f0c855db move some duplicate code into a separate function John W. Eaton <jwe@octave.org> parents: 23829 diff changeset	419 success = false;
1a53f0c855db move some duplicate code into a separate function John W. Eaton <jwe@octave.org> parents: 23829 diff changeset	420
1a53f0c855db move some duplicate code into a separate function John W. Eaton <jwe@octave.org> parents: 23829 diff changeset	421 return success;
1a53f0c855db move some duplicate code into a separate function John W. Eaton <jwe@octave.org> parents: 23829 diff changeset	422 }
1a53f0c855db move some duplicate code into a separate function John W. Eaton <jwe@octave.org> parents: 23829 diff changeset	423
1a53f0c855db move some duplicate code into a separate function John W. Eaton <jwe@octave.org> parents: 23829 diff changeset	424 bool
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	425 octave_fcn_handle::load_ascii (std::istream& is)
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	426 {
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	427 bool success = true;
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	428
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	429 std::streampos pos = is.tellg ();
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	430 std::string octaveroot = extract_keyword (is, "octaveroot", true);
21885 0806871e3e1e maint: Prefer is_empty() rather than "length () == 0". Rik <rik@octave.org> parents: 21867 diff changeset	431 if (octaveroot.empty ())
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	432 {
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	433 is.seekg (pos);
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	434 is.clear ();
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	435 }
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	436 pos = is.tellg ();
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	437 std::string fpath = extract_keyword (is, "path", true);
21885 0806871e3e1e maint: Prefer is_empty() rather than "length () == 0". Rik <rik@octave.org> parents: 21867 diff changeset	438 if (fpath.empty ())
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	439 {
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	440 is.seekg (pos);
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	441 is.clear ();
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	442 }
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	443
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	444 is >> nm;
4989 19b73a80e1d9 [project @ 2004-09-11 13:31:43 by jwe] jwe parents: 4988 diff changeset	445
10261 a4fb4675accb make printing of handles more Matlab-compatible Jaroslav Hajek <highegg@gmail.com> parents: 10250 diff changeset	446 if (nm == anonymous)
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	447 {
8946 e7e928088e90 fix CRLF issues with text-mode reading in windows when loading ascii data Benjamin Lindner <lindnerb@users.sourceforge.net> parents: 8920 diff changeset	448 skip_preceeding_newline (is);
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	449
8946 e7e928088e90 fix CRLF issues with text-mode reading in windows when loading ascii data Benjamin Lindner <lindnerb@users.sourceforge.net> parents: 8920 diff changeset	450 std::string buf;
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	451
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	452 if (is)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	453 {
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	454
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	455 // Get a line of text whitespace characters included, leaving
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	456 // newline in the stream.
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	457 buf = read_until_newline (is, true);
4989 19b73a80e1d9 [project @ 2004-09-11 13:31:43 by jwe] jwe parents: 4988 diff changeset	458
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	459 }
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	460
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	461 pos = is.tellg ();
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	462
21743 f4d7d0eb5b0c use namespace for unwind_protect class John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	463 octave::unwind_protect_safe frame;
9144 c6463412aebb eliminate symbol_table::scope_stack; fix scoping issue with evalin John W. Eaton <jwe@octave.org> parents: 8946 diff changeset	464
c6463412aebb eliminate symbol_table::scope_stack; fix scoping issue with evalin John W. Eaton <jwe@octave.org> parents: 8946 diff changeset	465 // Set up temporary scope to use for evaluating the text that
c6463412aebb eliminate symbol_table::scope_stack; fix scoping issue with evalin John W. Eaton <jwe@octave.org> parents: 8946 diff changeset	466 // defines the anonymous function.
c6463412aebb eliminate symbol_table::scope_stack; fix scoping issue with evalin John W. Eaton <jwe@octave.org> parents: 8946 diff changeset	467
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	468 octave::symbol_table& symtab
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23573 diff changeset	469 = octave::__get_symbol_table__ ("octave_fcn_handle::load_ascii");
9144 c6463412aebb eliminate symbol_table::scope_stack; fix scoping issue with evalin John W. Eaton <jwe@octave.org> parents: 8946 diff changeset	470
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	471 octave::symbol_table::scope local_scope;
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23573 diff changeset	472
23602 214cb58ccc1c use pointer to scope instead of scope id John W. Eaton <jwe@octave.org> parents: 23600 diff changeset	473 symtab.set_scope (&local_scope);
9144 c6463412aebb eliminate symbol_table::scope_stack; fix scoping issue with evalin John W. Eaton <jwe@octave.org> parents: 8946 diff changeset	474
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23502 diff changeset	475 octave::call_stack& cs
14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23502 diff changeset	476 = octave::__get_call_stack__ ("octave_fcn_handle::load_ascii");
14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23502 diff changeset	477
23602 214cb58ccc1c use pointer to scope instead of scope id John W. Eaton <jwe@octave.org> parents: 23600 diff changeset	478 cs.push (&local_scope, 0);
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23502 diff changeset	479 frame.add_method (cs, &octave::call_stack::pop);
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	480
8946 e7e928088e90 fix CRLF issues with text-mode reading in windows when loading ascii data Benjamin Lindner <lindnerb@users.sourceforge.net> parents: 8920 diff changeset	481 octave_idx_type len = 0;
e7e928088e90 fix CRLF issues with text-mode reading in windows when loading ascii data Benjamin Lindner <lindnerb@users.sourceforge.net> parents: 8920 diff changeset	482
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	483 if (extract_keyword (is, "length", len, true) && len >= 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	484 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	485 if (len > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	486 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	487 for (octave_idx_type i = 0; i < len; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	488 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	489 octave_value t2;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	490 bool dummy;
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	491
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	492 std::string name
21017 93748bcaec17 maint: Replace emtpy 'std::string ()' calls with "". Rik <rik@octave.org> parents: 20962 diff changeset	493 = read_text_data (is, "", dummy, t2, i);
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	494
20955 77f5591878bf maint: Use '! expr' rather than '!expr' to conform to coding guidelines. Rik <rik@octave.org> parents: 20953 diff changeset	495 if (! is)
20956 850e3d2533d4 maint: Eliminate more useless statements after error(). Rik <rik@octave.org> parents: 20955 diff changeset	496 error ("load: failed to load anonymous function handle");
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	497
23602 214cb58ccc1c use pointer to scope instead of scope id John W. Eaton <jwe@octave.org> parents: 23600 diff changeset	498 local_scope.assign (name, t2, 0);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	499 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	500 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	501 }
4989 19b73a80e1d9 [project @ 2004-09-11 13:31:43 by jwe] jwe parents: 4988 diff changeset	502 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	503 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	504 is.seekg (pos);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	505 is.clear ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	506 }
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	507
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	508 if (is && success)
24108 1a53f0c855db move some duplicate code into a separate function John W. Eaton <jwe@octave.org> parents: 23829 diff changeset	509 success = parse_anon_fcn_handle (buf);
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	510 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	511 success = false;
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	512 }
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	513 else
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	514 success = set_fcn (octaveroot, fpath);
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	515
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	516 return success;
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	517 }
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	518
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	519 bool
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	520 octave_fcn_handle::save_binary (std::ostream& os, bool& save_as_floats)
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	521 {
10261 a4fb4675accb make printing of handles more Matlab-compatible Jaroslav Hajek <highegg@gmail.com> parents: 10250 diff changeset	522 if (nm == anonymous)
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	523 {
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	524 std::ostringstream nmbuf;
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	525
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	526 if (fcn.is_undefined ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	527 return false;
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	528
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	529 std::list<octave::symbol_table::symbol_record> vars;
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	530
23611 91c8f006ed8b remove additional functions from symbol_table class John W. Eaton <jwe@octave.org> parents: 23603 diff changeset	531 octave_user_function *f = fcn.user_function_value ();
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	532 octave::symbol_table::scope *f_scope = f->scope ();
23611 91c8f006ed8b remove additional functions from symbol_table class John W. Eaton <jwe@octave.org> parents: 23603 diff changeset	533 if (f_scope)
91c8f006ed8b remove additional functions from symbol_table class John W. Eaton <jwe@octave.org> parents: 23603 diff changeset	534 vars = f_scope->all_variables ();
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	535
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	536 size_t varlen = vars.size ();
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	537
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	538 if (varlen > 0)
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23796 diff changeset	539 nmbuf << nm << ' ' << varlen;
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	540 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	541 nmbuf << nm;
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	542
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14544 diff changeset	543 std::string buf_str = nmbuf.str ();
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	544 int32_t tmp = buf_str.length ();
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	545 os.write (reinterpret_cast<char *> (&tmp), 4);
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	546 os.write (buf_str.c_str (), buf_str.length ());
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	547
5765 7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5760 diff changeset	548 std::ostringstream buf;
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	549 print_raw (buf, true);
5765 7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5760 diff changeset	550 std::string stmp = buf.str ();
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	551 tmp = stmp.length ();
5760 8d7162924bd3 [project @ 2006-04-14 04:01:37 by jwe] jwe parents: 5663 diff changeset	552 os.write (reinterpret_cast<char *> (&tmp), 4);
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	553 os.write (stmp.c_str (), stmp.length ());
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	554
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	555 if (varlen > 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	556 {
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22755 diff changeset	557 for (const auto& symrec : vars)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	558 {
23603 18bd46c4b79a make symbol table context info mostly local to symbol table scopes John W. Eaton <jwe@octave.org> parents: 23602 diff changeset	559 if (! save_binary_data (os, symrec.varval (), symrec.name (),
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	560 "", 0, save_as_floats))
18384 bd9d34f28b0f Use std::ostream::fail instead of unsafe implicit bool conversion (bug #41335) Mike Miller <mtmiller@ieee.org> parents: 17898 diff changeset	561 return ! os.fail ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	562 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	563 }
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	564 }
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	565 else
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	566 {
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	567 std::ostringstream nmbuf;
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	568
7744 14b841c47a5f handle load/save for handles to built-in functions John W. Eaton <jwe@octave.org> parents: 7740 diff changeset	569 octave_function *f = function_value ();
23450 855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23445 diff changeset	570 std::string fnm = (f ? f->fcn_file_name () : "");
7744 14b841c47a5f handle load/save for handles to built-in functions John W. Eaton <jwe@octave.org> parents: 7740 diff changeset	571
23717 06579337237b move configuration variables inside octave::config namespace John W. Eaton <jwe@octave.org> parents: 23712 diff changeset	572 nmbuf << nm << "\n" << octave::config::octave_exec_home () << "\n" << fnm;
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	573
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	574 std::string buf_str = nmbuf.str ();
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	575 int32_t tmp = buf_str.length ();
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	576 os.write (reinterpret_cast<char *> (&tmp), 4);
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	577 os.write (buf_str.c_str (), buf_str.length ());
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	578 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	579
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	580 return true;
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	581 }
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	582
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	583 bool
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	584 octave_fcn_handle::load_binary (std::istream& is, bool swap,
21739 c4ab2e54f100 use namespace for oct_mach_info class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	585 octave::mach_info::float_format fmt)
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	586 {
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	587 bool success = true;
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	588
5828 22e23bee74c8 [project @ 2006-05-23 06:05:14 by jwe] jwe parents: 5823 diff changeset	589 int32_t tmp;
5760 8d7162924bd3 [project @ 2006-04-14 04:01:37 by jwe] jwe parents: 5663 diff changeset	590 if (! is.read (reinterpret_cast<char *> (&tmp), 4))
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	591 return false;
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	592 if (swap)
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	593 swap_bytes<4> (&tmp);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	594
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	595 OCTAVE_LOCAL_BUFFER (char, ctmp1, tmp+1);
12714 65b7ce254ba3 Fix loading of function handles saved in binary format. Bug #33456. Olaf Till <olaf.till@uni-jena.de> parents: 12483 diff changeset	596 // is.get (ctmp1, tmp+1, 0); caused is.eof () to be true though
65b7ce254ba3 Fix loading of function handles saved in binary format. Bug #33456. Olaf Till <olaf.till@uni-jena.de> parents: 12483 diff changeset	597 // effectively not reading over file end
65b7ce254ba3 Fix loading of function handles saved in binary format. Bug #33456. Olaf Till <olaf.till@uni-jena.de> parents: 12483 diff changeset	598 is.read (ctmp1, tmp);
65b7ce254ba3 Fix loading of function handles saved in binary format. Bug #33456. Olaf Till <olaf.till@uni-jena.de> parents: 12483 diff changeset	599 ctmp1[tmp] = 0;
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	600 nm = std::string (ctmp1);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	601
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	602 if (! is)
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	603 return false;
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	604
10261 a4fb4675accb make printing of handles more Matlab-compatible Jaroslav Hajek <highegg@gmail.com> parents: 10250 diff changeset	605 size_t anl = anonymous.length ();
a4fb4675accb make printing of handles more Matlab-compatible Jaroslav Hajek <highegg@gmail.com> parents: 10250 diff changeset	606
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14544 diff changeset	607 if (nm.length () >= anl && nm.substr (0, anl) == anonymous)
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	608 {
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	609 octave_idx_type len = 0;
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	610
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14544 diff changeset	611 if (nm.length () > anl)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	612 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	613 std::istringstream nm_is (nm.substr (anl));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	614 nm_is >> len;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	615 nm = nm.substr (0, anl);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	616 }
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	617
5760 8d7162924bd3 [project @ 2006-04-14 04:01:37 by jwe] jwe parents: 5663 diff changeset	618 if (! is.read (reinterpret_cast<char *> (&tmp), 4))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	619 return false;
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	620 if (swap)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	621 swap_bytes<4> (&tmp);
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	622
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	623 OCTAVE_LOCAL_BUFFER (char, ctmp2, tmp+1);
12714 65b7ce254ba3 Fix loading of function handles saved in binary format. Bug #33456. Olaf Till <olaf.till@uni-jena.de> parents: 12483 diff changeset	624 // is.get (ctmp2, tmp+1, 0); caused is.eof () to be true though
65b7ce254ba3 Fix loading of function handles saved in binary format. Bug #33456. Olaf Till <olaf.till@uni-jena.de> parents: 12483 diff changeset	625 // effectively not reading over file end
65b7ce254ba3 Fix loading of function handles saved in binary format. Bug #33456. Olaf Till <olaf.till@uni-jena.de> parents: 12483 diff changeset	626 is.read (ctmp2, tmp);
65b7ce254ba3 Fix loading of function handles saved in binary format. Bug #33456. Olaf Till <olaf.till@uni-jena.de> parents: 12483 diff changeset	627 ctmp2[tmp] = 0;
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	628
21743 f4d7d0eb5b0c use namespace for unwind_protect class John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	629 octave::unwind_protect_safe frame;
9144 c6463412aebb eliminate symbol_table::scope_stack; fix scoping issue with evalin John W. Eaton <jwe@octave.org> parents: 8946 diff changeset	630
c6463412aebb eliminate symbol_table::scope_stack; fix scoping issue with evalin John W. Eaton <jwe@octave.org> parents: 8946 diff changeset	631 // Set up temporary scope to use for evaluating the text that
c6463412aebb eliminate symbol_table::scope_stack; fix scoping issue with evalin John W. Eaton <jwe@octave.org> parents: 8946 diff changeset	632 // defines the anonymous function.
c6463412aebb eliminate symbol_table::scope_stack; fix scoping issue with evalin John W. Eaton <jwe@octave.org> parents: 8946 diff changeset	633
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	634 octave::symbol_table& symtab
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23573 diff changeset	635 = octave::__get_symbol_table__ ("octave_fcn_handle::load_binary");
9144 c6463412aebb eliminate symbol_table::scope_stack; fix scoping issue with evalin John W. Eaton <jwe@octave.org> parents: 8946 diff changeset	636
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	637 octave::symbol_table::scope local_scope;
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23573 diff changeset	638
23602 214cb58ccc1c use pointer to scope instead of scope id John W. Eaton <jwe@octave.org> parents: 23600 diff changeset	639 symtab.set_scope (&local_scope);
9144 c6463412aebb eliminate symbol_table::scope_stack; fix scoping issue with evalin John W. Eaton <jwe@octave.org> parents: 8946 diff changeset	640
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23502 diff changeset	641 octave::call_stack& cs
14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23502 diff changeset	642 = octave::__get_call_stack__ ("octave_fcn_handle::load_binary");
14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23502 diff changeset	643
23602 214cb58ccc1c use pointer to scope instead of scope id John W. Eaton <jwe@octave.org> parents: 23600 diff changeset	644 cs.push (&local_scope, 0);
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23502 diff changeset	645 frame.add_method (cs, &octave::call_stack::pop);
9144 c6463412aebb eliminate symbol_table::scope_stack; fix scoping issue with evalin John W. Eaton <jwe@octave.org> parents: 8946 diff changeset	646
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	647 if (len > 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	648 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	649 for (octave_idx_type i = 0; i < len; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	650 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	651 octave_value t2;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	652 bool dummy;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	653 std::string doc;
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	654
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11541 diff changeset	655 std::string name =
21017 93748bcaec17 maint: Replace emtpy 'std::string ()' calls with "". Rik <rik@octave.org> parents: 20962 diff changeset	656 read_binary_data (is, swap, fmt, "",
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	657 dummy, t2, doc);
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	658
20955 77f5591878bf maint: Use '! expr' rather than '!expr' to conform to coding guidelines. Rik <rik@octave.org> parents: 20953 diff changeset	659 if (! is)
20956 850e3d2533d4 maint: Eliminate more useless statements after error(). Rik <rik@octave.org> parents: 20955 diff changeset	660 error ("load: failed to load anonymous function handle");
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	661
23602 214cb58ccc1c use pointer to scope instead of scope id John W. Eaton <jwe@octave.org> parents: 23600 diff changeset	662 local_scope.force_assign (name, t2);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	663 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	664 }
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	665
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	666 if (is && success)
24108 1a53f0c855db move some duplicate code into a separate function John W. Eaton <jwe@octave.org> parents: 23829 diff changeset	667 success = parse_anon_fcn_handle (ctmp2);
1a53f0c855db move some duplicate code into a separate function John W. Eaton <jwe@octave.org> parents: 23829 diff changeset	668 else
1a53f0c855db move some duplicate code into a separate function John W. Eaton <jwe@octave.org> parents: 23829 diff changeset	669 success = false;
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	670 }
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	671 else
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	672 {
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	673 std::string octaveroot;
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	674 std::string fpath;
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	675
23829 01899bdd2a3a Eliminate unnecessary std::string ("...") constructor calls when "..." suffices. Rik <rik@octave.org> parents: 23807 diff changeset	676 if (nm.find_first_of ('\n') != std::string::npos)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	677 {
23829 01899bdd2a3a Eliminate unnecessary std::string ("...") constructor calls when "..." suffices. Rik <rik@octave.org> parents: 23807 diff changeset	678 size_t pos1 = nm.find_first_of ('\n');
01899bdd2a3a Eliminate unnecessary std::string ("...") constructor calls when "..." suffices. Rik <rik@octave.org> parents: 23807 diff changeset	679 size_t pos2 = nm.find_first_of ('\n', pos1 + 1);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	680 octaveroot = nm.substr (pos1 + 1, pos2 - pos1 - 1);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	681 fpath = nm.substr (pos2 + 1);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	682 nm = nm.substr (0, pos1);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	683 }
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	684
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	685 success = set_fcn (octaveroot, fpath);
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	686 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11541 diff changeset	687
12714 65b7ce254ba3 Fix loading of function handles saved in binary format. Bug #33456. Olaf Till <olaf.till@uni-jena.de> parents: 12483 diff changeset	688 return success;
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	689 }
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	690
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	691 bool
19863 09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	692 octave_fcn_handle::save_hdf5 (octave_hdf5_id loc_id, const char *name,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	693 bool save_as_floats)
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	694 {
19863 09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	695 #if defined (HAVE_HDF5)
09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	696
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	697 bool retval = true;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	698
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	699 hid_t group_hid = -1;
21211 2cf8bc5c7017 use "#if defined (HAVE_FOO)" instead of "#if HAVE_FOO" for feature tests John W. Eaton <jwe@octave.org> parents: 21200 diff changeset	700 #if defined (HAVE_HDF5_18)
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	701 group_hid = H5Gcreate (loc_id, name, octave_H5P_DEFAULT, octave_H5P_DEFAULT,
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	702 octave_H5P_DEFAULT);
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	703 #else
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	704 group_hid = H5Gcreate (loc_id, name, 0);
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	705 #endif
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	706 if (group_hid < 0)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	707 return false;
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	708
18100 6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 18019 diff changeset	709 hid_t space_hid, data_hid, type_hid;
6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 18019 diff changeset	710 space_hid = data_hid = type_hid = -1;
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	711
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	712 // attach the type of the variable
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	713 type_hid = H5Tcopy (H5T_C_S1);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	714 H5Tset_size (type_hid, nm.length () + 1);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	715 if (type_hid < 0)
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	716 {
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	717 H5Gclose (group_hid);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	718 return false;
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	719 }
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	720
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	721 OCTAVE_LOCAL_BUFFER (hsize_t, hdims, 2);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	722 hdims[0] = 0;
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	723 hdims[1] = 0;
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23717 diff changeset	724 space_hid = H5Screate_simple (0 , hdims, nullptr);
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	725 if (space_hid < 0)
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	726 {
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	727 H5Tclose (type_hid);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	728 H5Gclose (group_hid);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	729 return false;
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	730 }
21211 2cf8bc5c7017 use "#if defined (HAVE_FOO)" instead of "#if HAVE_FOO" for feature tests John W. Eaton <jwe@octave.org> parents: 21200 diff changeset	731 #if defined (HAVE_HDF5_18)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11541 diff changeset	732 data_hid = H5Dcreate (group_hid, "nm", type_hid, space_hid,
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	733 octave_H5P_DEFAULT, octave_H5P_DEFAULT,
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	734 octave_H5P_DEFAULT);
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	735 #else
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	736 data_hid = H5Dcreate (group_hid, "nm", type_hid, space_hid,
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	737 octave_H5P_DEFAULT);
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	738 #endif
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	739 if (data_hid < 0
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	740 \|\| H5Dwrite (data_hid, type_hid, octave_H5S_ALL, octave_H5S_ALL,
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	741 octave_H5P_DEFAULT, nm.c_str ()) < 0)
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	742 {
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	743 H5Sclose (space_hid);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	744 H5Tclose (type_hid);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	745 H5Gclose (group_hid);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	746 return false;
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	747 }
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	748 H5Dclose (data_hid);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	749
10261 a4fb4675accb make printing of handles more Matlab-compatible Jaroslav Hajek <highegg@gmail.com> parents: 10250 diff changeset	750 if (nm == anonymous)
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	751 {
5765 7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5760 diff changeset	752 std::ostringstream buf;
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	753 print_raw (buf, true);
5765 7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5760 diff changeset	754 std::string stmp = buf.str ();
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	755
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	756 // attach the type of the variable
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	757 H5Tset_size (type_hid, stmp.length () + 1);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	758 if (type_hid < 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	759 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	760 H5Sclose (space_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	761 H5Gclose (group_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	762 return false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	763 }
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	764
21211 2cf8bc5c7017 use "#if defined (HAVE_FOO)" instead of "#if HAVE_FOO" for feature tests John W. Eaton <jwe@octave.org> parents: 21200 diff changeset	765 #if defined (HAVE_HDF5_18)
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	766 data_hid = H5Dcreate (group_hid, "fcn", type_hid, space_hid,
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	767 octave_H5P_DEFAULT, octave_H5P_DEFAULT,
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	768 octave_H5P_DEFAULT);
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	769 #else
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	770 data_hid = H5Dcreate (group_hid, "fcn", type_hid, space_hid,
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 21017 diff changeset	771 octave_H5P_DEFAULT);
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	772 #endif
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	773 if (data_hid < 0
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	774 \|\| H5Dwrite (data_hid, type_hid, octave_H5S_ALL, octave_H5S_ALL,
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	775 octave_H5P_DEFAULT, stmp.c_str ()) < 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	776 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	777 H5Sclose (space_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	778 H5Tclose (type_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	779 H5Gclose (group_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	780 return false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	781 }
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	782
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	783 H5Dclose (data_hid);
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	784
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	785 std::list<octave::symbol_table::symbol_record> vars;
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	786
23611 91c8f006ed8b remove additional functions from symbol_table class John W. Eaton <jwe@octave.org> parents: 23603 diff changeset	787 octave_user_function *f = fcn.user_function_value ();
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	788 octave::symbol_table::scope *f_scope = f->scope ();
23611 91c8f006ed8b remove additional functions from symbol_table class John W. Eaton <jwe@octave.org> parents: 23603 diff changeset	789 if (f_scope)
91c8f006ed8b remove additional functions from symbol_table class John W. Eaton <jwe@octave.org> parents: 23603 diff changeset	790 vars = f_scope->all_variables ();
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	791
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	792 size_t varlen = vars.size ();
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	793
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	794 if (varlen > 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	795 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	796 hid_t as_id = H5Screate (H5S_SCALAR);
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	797
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	798 if (as_id >= 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	799 {
21211 2cf8bc5c7017 use "#if defined (HAVE_FOO)" instead of "#if HAVE_FOO" for feature tests John W. Eaton <jwe@octave.org> parents: 21200 diff changeset	800 #if defined (HAVE_HDF5_18)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	801 hid_t a_id = H5Acreate (group_hid, "SYMBOL_TABLE",
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11541 diff changeset	802 H5T_NATIVE_IDX, as_id,
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 21017 diff changeset	803 octave_H5P_DEFAULT, octave_H5P_DEFAULT);
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	804
ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	805 #else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	806 hid_t a_id = H5Acreate (group_hid, "SYMBOL_TABLE",
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 21017 diff changeset	807 H5T_NATIVE_IDX, as_id, octave_H5P_DEFAULT);
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	808 #endif
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	809
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	810 if (a_id >= 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	811 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	812 retval = (H5Awrite (a_id, H5T_NATIVE_IDX, &varlen) >= 0);
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	813
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	814 H5Aclose (a_id);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	815 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	816 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	817 retval = false;
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	818
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	819 H5Sclose (as_id);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	820 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	821 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	822 retval = false;
21211 2cf8bc5c7017 use "#if defined (HAVE_FOO)" instead of "#if HAVE_FOO" for feature tests John W. Eaton <jwe@octave.org> parents: 21200 diff changeset	823 #if defined (HAVE_HDF5_18)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	824 data_hid = H5Gcreate (group_hid, "symbol table",
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 21017 diff changeset	825 octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT);
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	826 #else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	827 data_hid = H5Gcreate (group_hid, "symbol table", 0);
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	828 #endif
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11541 diff changeset	829 if (data_hid < 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	830 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	831 H5Sclose (space_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	832 H5Tclose (type_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	833 H5Gclose (group_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	834 return false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	835 }
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	836
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22755 diff changeset	837 for (const auto& symrec : vars)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	838 {
23603 18bd46c4b79a make symbol table context info mostly local to symbol table scopes John W. Eaton <jwe@octave.org> parents: 23602 diff changeset	839 if (! add_hdf5_data (data_hid, symrec.varval (), symrec.name (),
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	840 "", false, save_as_floats))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	841 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	842 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	843 H5Gclose (data_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	844 }
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	845 }
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	846 else
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	847 {
23717 06579337237b move configuration variables inside octave::config namespace John W. Eaton <jwe@octave.org> parents: 23712 diff changeset	848 std::string octaveroot = octave::config::octave_exec_home ();
7744 14b841c47a5f handle load/save for handles to built-in functions John W. Eaton <jwe@octave.org> parents: 7740 diff changeset	849
14b841c47a5f handle load/save for handles to built-in functions John W. Eaton <jwe@octave.org> parents: 7740 diff changeset	850 octave_function *f = function_value ();
23450 855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23445 diff changeset	851 std::string fpath = (f ? f->fcn_file_name () : "");
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	852
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	853 H5Sclose (space_hid);
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	854 hdims[0] = 1;
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	855 hdims[1] = octaveroot.length ();
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23717 diff changeset	856 space_hid = H5Screate_simple (0 , hdims, nullptr);
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	857 if (space_hid < 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	858 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	859 H5Tclose (type_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	860 H5Gclose (group_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	861 return false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	862 }
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	863
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	864 H5Tclose (type_hid);
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	865 type_hid = H5Tcopy (H5T_C_S1);
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	866 H5Tset_size (type_hid, octaveroot.length () + 1);
21211 2cf8bc5c7017 use "#if defined (HAVE_FOO)" instead of "#if HAVE_FOO" for feature tests John W. Eaton <jwe@octave.org> parents: 21200 diff changeset	867 #if defined (HAVE_HDF5_18)
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	868 hid_t a_id = H5Acreate (group_hid, "OCTAVEROOT",
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 21017 diff changeset	869 type_hid, space_hid, octave_H5P_DEFAULT, octave_H5P_DEFAULT);
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	870 #else
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	871 hid_t a_id = H5Acreate (group_hid, "OCTAVEROOT",
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 21017 diff changeset	872 type_hid, space_hid, octave_H5P_DEFAULT);
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	873 #endif
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	874
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	875 if (a_id >= 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	876 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	877 retval = (H5Awrite (a_id, type_hid, octaveroot.c_str ()) >= 0);
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	878
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	879 H5Aclose (a_id);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	880 }
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	881 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	882 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	883 H5Sclose (space_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	884 H5Tclose (type_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	885 H5Gclose (group_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	886 return false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	887 }
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	888
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	889 H5Sclose (space_hid);
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	890 hdims[0] = 1;
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	891 hdims[1] = fpath.length ();
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23717 diff changeset	892 space_hid = H5Screate_simple (0 , hdims, nullptr);
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	893 if (space_hid < 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	894 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	895 H5Tclose (type_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	896 H5Gclose (group_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	897 return false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	898 }
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	899
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	900 H5Tclose (type_hid);
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	901 type_hid = H5Tcopy (H5T_C_S1);
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	902 H5Tset_size (type_hid, fpath.length () + 1);
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	903
21211 2cf8bc5c7017 use "#if defined (HAVE_FOO)" instead of "#if HAVE_FOO" for feature tests John W. Eaton <jwe@octave.org> parents: 21200 diff changeset	904 #if defined (HAVE_HDF5_18)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11541 diff changeset	905 a_id = H5Acreate (group_hid, "FILE", type_hid, space_hid,
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 21017 diff changeset	906 octave_H5P_DEFAULT, octave_H5P_DEFAULT);
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	907 #else
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 21017 diff changeset	908 a_id = H5Acreate (group_hid, "FILE", type_hid, space_hid, octave_H5P_DEFAULT);
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	909 #endif
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	910
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	911 if (a_id >= 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	912 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	913 retval = (H5Awrite (a_id, type_hid, fpath.c_str ()) >= 0);
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	914
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	915 H5Aclose (a_id);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	916 }
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	917 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	918 retval = false;
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	919 }
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	920
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	921 H5Sclose (space_hid);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	922 H5Tclose (type_hid);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	923 H5Gclose (group_hid);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	924
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	925 return retval;
19863 09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	926
09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	927 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21580 diff changeset	928 octave_unused_parameter (loc_id);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21580 diff changeset	929 octave_unused_parameter (name);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21580 diff changeset	930 octave_unused_parameter (save_as_floats);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21580 diff changeset	931
21102 dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	932 warn_save ("hdf5");
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21580 diff changeset	933
19863 09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	934 return false;
09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	935 #endif
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	936 }
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	937
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	938 bool
19863 09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	939 octave_fcn_handle::load_hdf5 (octave_hdf5_id loc_id, const char *name)
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	940 {
19863 09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	941 #if defined (HAVE_HDF5)
09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	942
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	943 bool success = true;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	944
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	945 hid_t group_hid, data_hid, space_hid, type_hid, type_class_hid, st_id;
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	946 hsize_t rank;
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	947 int slen;
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	948
21211 2cf8bc5c7017 use "#if defined (HAVE_FOO)" instead of "#if HAVE_FOO" for feature tests John W. Eaton <jwe@octave.org> parents: 21200 diff changeset	949 #if defined (HAVE_HDF5_18)
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 21017 diff changeset	950 group_hid = H5Gopen (loc_id, name, octave_H5P_DEFAULT);
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	951 #else
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	952 group_hid = H5Gopen (loc_id, name);
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	953 #endif
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	954 if (group_hid < 0)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	955 return false;
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	956
21211 2cf8bc5c7017 use "#if defined (HAVE_FOO)" instead of "#if HAVE_FOO" for feature tests John W. Eaton <jwe@octave.org> parents: 21200 diff changeset	957 #if defined (HAVE_HDF5_18)
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 21017 diff changeset	958 data_hid = H5Dopen (group_hid, "nm", octave_H5P_DEFAULT);
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	959 #else
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	960 data_hid = H5Dopen (group_hid, "nm");
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	961 #endif
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	962
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	963 if (data_hid < 0)
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	964 {
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	965 H5Gclose (group_hid);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	966 return false;
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	967 }
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	968
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	969 type_hid = H5Dget_type (data_hid);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	970 type_class_hid = H5Tget_class (type_hid);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	971
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	972 if (type_class_hid != H5T_STRING)
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	973 {
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	974 H5Tclose (type_hid);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	975 H5Dclose (data_hid);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	976 H5Gclose (group_hid);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	977 return false;
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	978 }
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	979
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	980 space_hid = H5Dget_space (data_hid);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	981 rank = H5Sget_simple_extent_ndims (space_hid);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	982
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	983 if (rank != 0)
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	984 {
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	985 H5Sclose (space_hid);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	986 H5Tclose (type_hid);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	987 H5Dclose (data_hid);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	988 H5Gclose (group_hid);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	989 return false;
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	990 }
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	991
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	992 slen = H5Tget_size (type_hid);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	993 if (slen < 0)
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	994 {
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	995 H5Sclose (space_hid);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	996 H5Tclose (type_hid);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	997 H5Dclose (data_hid);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	998 H5Gclose (group_hid);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	999 return false;
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1000 }
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1001
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1002 OCTAVE_LOCAL_BUFFER (char, nm_tmp, slen);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1003
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1004 // create datatype for (null-terminated) string to read into:
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1005 st_id = H5Tcopy (H5T_C_S1);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1006 H5Tset_size (st_id, slen);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1007
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	1008 if (H5Dread (data_hid, st_id, octave_H5S_ALL, octave_H5S_ALL,
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	1009 octave_H5P_DEFAULT, nm_tmp)
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	1010 < 0)
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1011 {
6695 c45431c845f3 [project @ 2007-06-07 21:30:39 by dbateman] dbateman parents: 6657 diff changeset	1012 H5Tclose (st_id);
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1013 H5Sclose (space_hid);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1014 H5Tclose (type_hid);
6695 c45431c845f3 [project @ 2007-06-07 21:30:39 by dbateman] dbateman parents: 6657 diff changeset	1015 H5Dclose (data_hid);
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1016 H5Gclose (group_hid);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1017 return false;
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1018 }
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1019 H5Tclose (st_id);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1020 H5Dclose (data_hid);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1021 nm = nm_tmp;
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1022
10261 a4fb4675accb make printing of handles more Matlab-compatible Jaroslav Hajek <highegg@gmail.com> parents: 10250 diff changeset	1023 if (nm == anonymous)
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1024 {
21211 2cf8bc5c7017 use "#if defined (HAVE_FOO)" instead of "#if HAVE_FOO" for feature tests John W. Eaton <jwe@octave.org> parents: 21200 diff changeset	1025 #if defined (HAVE_HDF5_18)
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 21017 diff changeset	1026 data_hid = H5Dopen (group_hid, "fcn", octave_H5P_DEFAULT);
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	1027 #else
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1028 data_hid = H5Dopen (group_hid, "fcn");
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	1029 #endif
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1030
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1031 if (data_hid < 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1032 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1033 H5Sclose (space_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1034 H5Tclose (type_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1035 H5Gclose (group_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1036 return false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1037 }
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1038
6695 c45431c845f3 [project @ 2007-06-07 21:30:39 by dbateman] dbateman parents: 6657 diff changeset	1039 H5Tclose (type_hid);
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1040 type_hid = H5Dget_type (data_hid);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1041 type_class_hid = H5Tget_class (type_hid);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1042
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1043 if (type_class_hid != H5T_STRING)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1044 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1045 H5Sclose (space_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1046 H5Tclose (type_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1047 H5Dclose (data_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1048 H5Gclose (group_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1049 return false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1050 }
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1051
6695 c45431c845f3 [project @ 2007-06-07 21:30:39 by dbateman] dbateman parents: 6657 diff changeset	1052 H5Sclose (space_hid);
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1053 space_hid = H5Dget_space (data_hid);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1054 rank = H5Sget_simple_extent_ndims (space_hid);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1055
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1056 if (rank != 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1057 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1058 H5Sclose (space_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1059 H5Tclose (type_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1060 H5Dclose (data_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1061 H5Gclose (group_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1062 return false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1063 }
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1064
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1065 slen = H5Tget_size (type_hid);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1066 if (slen < 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1067 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1068 H5Sclose (space_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1069 H5Tclose (type_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1070 H5Dclose (data_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1071 H5Gclose (group_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1072 return false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1073 }
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1074
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1075 OCTAVE_LOCAL_BUFFER (char, fcn_tmp, slen);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1076
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1077 // create datatype for (null-terminated) string to read into:
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1078 st_id = H5Tcopy (H5T_C_S1);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1079 H5Tset_size (st_id, slen);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1080
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	1081 if (H5Dread (data_hid, st_id, octave_H5S_ALL, octave_H5S_ALL,
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	1082 octave_H5P_DEFAULT, fcn_tmp)
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	1083 < 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1084 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1085 H5Tclose (st_id);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1086 H5Sclose (space_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1087 H5Tclose (type_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1088 H5Dclose (data_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1089 H5Gclose (group_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1090 return false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1091 }
6695 c45431c845f3 [project @ 2007-06-07 21:30:39 by dbateman] dbateman parents: 6657 diff changeset	1092 H5Tclose (st_id);
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1093 H5Dclose (data_hid);
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1094
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1095 octave_idx_type len = 0;
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1096
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1097 // we have to pull some shenanigans here to make sure
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1098 // HDF5 doesn't print out all sorts of error messages if we
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1099 // call H5Aopen for a non-existing attribute
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1100
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1101 H5E_auto_t err_func;
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1102 void *err_func_data;
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1103
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1104 // turn off error reporting temporarily, but save the error
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1105 // reporting function:
21211 2cf8bc5c7017 use "#if defined (HAVE_FOO)" instead of "#if HAVE_FOO" for feature tests John W. Eaton <jwe@octave.org> parents: 21200 diff changeset	1106 #if defined (HAVE_HDF5_18)
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 21017 diff changeset	1107 H5Eget_auto (octave_H5E_DEFAULT, &err_func, &err_func_data);
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23795 diff changeset	1108 H5Eset_auto (octave_H5E_DEFAULT, nullptr, nullptr);
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	1109 #else
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1110 H5Eget_auto (&err_func, &err_func_data);
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23795 diff changeset	1111 H5Eset_auto (nullptr, nullptr);
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	1112 #endif
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1113
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1114 hid_t attr_id = H5Aopen_name (group_hid, "SYMBOL_TABLE");
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1115
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1116 if (attr_id >= 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1117 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1118 if (H5Aread (attr_id, H5T_NATIVE_IDX, &len) < 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1119 success = false;
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1120
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1121 H5Aclose (attr_id);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1122 }
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1123
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1124 // restore error reporting:
21211 2cf8bc5c7017 use "#if defined (HAVE_FOO)" instead of "#if HAVE_FOO" for feature tests John W. Eaton <jwe@octave.org> parents: 21200 diff changeset	1125 #if defined (HAVE_HDF5_18)
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 21017 diff changeset	1126 H5Eset_auto (octave_H5E_DEFAULT, err_func, err_func_data);
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	1127 #else
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1128 H5Eset_auto (err_func, err_func_data);
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	1129 #endif
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1130
21743 f4d7d0eb5b0c use namespace for unwind_protect class John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	1131 octave::unwind_protect_safe frame;
9144 c6463412aebb eliminate symbol_table::scope_stack; fix scoping issue with evalin John W. Eaton <jwe@octave.org> parents: 8946 diff changeset	1132
c6463412aebb eliminate symbol_table::scope_stack; fix scoping issue with evalin John W. Eaton <jwe@octave.org> parents: 8946 diff changeset	1133 // Set up temporary scope to use for evaluating the text that
c6463412aebb eliminate symbol_table::scope_stack; fix scoping issue with evalin John W. Eaton <jwe@octave.org> parents: 8946 diff changeset	1134 // defines the anonymous function.
c6463412aebb eliminate symbol_table::scope_stack; fix scoping issue with evalin John W. Eaton <jwe@octave.org> parents: 8946 diff changeset	1135
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	1136 octave::symbol_table& symtab
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23573 diff changeset	1137 = octave::__get_symbol_table__ ("octave_fcn_handle::load_hdf5");
9144 c6463412aebb eliminate symbol_table::scope_stack; fix scoping issue with evalin John W. Eaton <jwe@octave.org> parents: 8946 diff changeset	1138
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	1139 octave::symbol_table::scope local_scope;
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23573 diff changeset	1140
23602 214cb58ccc1c use pointer to scope instead of scope id John W. Eaton <jwe@octave.org> parents: 23600 diff changeset	1141 symtab.set_scope (&local_scope);
9144 c6463412aebb eliminate symbol_table::scope_stack; fix scoping issue with evalin John W. Eaton <jwe@octave.org> parents: 8946 diff changeset	1142
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23502 diff changeset	1143 octave::call_stack& cs
14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23502 diff changeset	1144 = octave::__get_call_stack__ ("octave_fcn_handle::load_hdf5");
14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23502 diff changeset	1145
23602 214cb58ccc1c use pointer to scope instead of scope id John W. Eaton <jwe@octave.org> parents: 23600 diff changeset	1146 cs.push (&local_scope, 0);
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23502 diff changeset	1147 frame.add_method (cs, &octave::call_stack::pop);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	1148
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1149 if (len > 0 && success)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1150 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1151 hsize_t num_obj = 0;
21211 2cf8bc5c7017 use "#if defined (HAVE_FOO)" instead of "#if HAVE_FOO" for feature tests John W. Eaton <jwe@octave.org> parents: 21200 diff changeset	1152 #if defined (HAVE_HDF5_18)
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 21017 diff changeset	1153 data_hid = H5Gopen (group_hid, "symbol table", octave_H5P_DEFAULT);
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	1154 #else
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11541 diff changeset	1155 data_hid = H5Gopen (group_hid, "symbol table");
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	1156 #endif
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1157 H5Gget_num_objs (data_hid, &num_obj);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1158 H5Gclose (data_hid);
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1159
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1160 if (num_obj != static_cast<hsize_t>(len))
20953 758b71e964ce maint: Eliminate more useless statements after error(). Rik <rik@octave.org> parents: 20952 diff changeset	1161 error ("load: failed to load anonymous function handle");
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1162
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1163 hdf5_callback_data dsub;
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1164 int current_item = 0;
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1165 for (octave_idx_type i = 0; i < len; i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1166 {
22028 5c949eecb6dd use int64_t for octave_hdf5_id (bug #47858) Stefan Miereis <stefan.miereis@gmx.de> parents: 21966 diff changeset	1167 if (hdf5_h5g_iterate (group_hid, "symbol table", &current_item,
5c949eecb6dd use int64_t for octave_hdf5_id (bug #47858) Stefan Miereis <stefan.miereis@gmx.de> parents: 21966 diff changeset	1168 &dsub) <= 0)
20957 9db35d2042be maint: eliminate special cases of statements after error. Rik <rik@octave.org> parents: 20956 diff changeset	1169 error ("load: failed to load anonymous function handle");
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1170
23602 214cb58ccc1c use pointer to scope instead of scope id John W. Eaton <jwe@octave.org> parents: 23600 diff changeset	1171 local_scope.force_assign (dsub.name, dsub.tc);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1172 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1173 }
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1174
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1175 if (success)
24108 1a53f0c855db move some duplicate code into a separate function John W. Eaton <jwe@octave.org> parents: 23829 diff changeset	1176 success = parse_anon_fcn_handle (fcn_tmp);
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1177
10066 2cd940306a06 make unwind_protect frames local Jaroslav Hajek <highegg@gmail.com> parents: 9892 diff changeset	1178 frame.run ();
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1179 }
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1180 else
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1181 {
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1182 std::string octaveroot;
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1183 std::string fpath;
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1184
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1185 // we have to pull some shenanigans here to make sure
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1186 // HDF5 doesn't print out all sorts of error messages if we
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1187 // call H5Aopen for a non-existing attribute
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1188
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1189 H5E_auto_t err_func;
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1190 void *err_func_data;
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1191
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1192 // turn off error reporting temporarily, but save the error
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1193 // reporting function:
21211 2cf8bc5c7017 use "#if defined (HAVE_FOO)" instead of "#if HAVE_FOO" for feature tests John W. Eaton <jwe@octave.org> parents: 21200 diff changeset	1194 #if defined (HAVE_HDF5_18)
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 21017 diff changeset	1195 H5Eget_auto (octave_H5E_DEFAULT, &err_func, &err_func_data);
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23795 diff changeset	1196 H5Eset_auto (octave_H5E_DEFAULT, nullptr, nullptr);
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	1197 #else
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1198 H5Eget_auto (&err_func, &err_func_data);
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23795 diff changeset	1199 H5Eset_auto (nullptr, nullptr);
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	1200 #endif
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1201
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1202 hid_t attr_id = H5Aopen_name (group_hid, "OCTAVEROOT");
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1203 if (attr_id >= 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1204 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1205 H5Tclose (type_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1206 type_hid = H5Aget_type (attr_id);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1207 type_class_hid = H5Tget_class (type_hid);
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1208
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1209 if (type_class_hid != H5T_STRING)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1210 success = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1211 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1212 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1213 slen = H5Tget_size (type_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1214 st_id = H5Tcopy (H5T_C_S1);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1215 H5Tset_size (st_id, slen);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1216 OCTAVE_LOCAL_BUFFER (char, root_tmp, slen);
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1217
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1218 if (H5Aread (attr_id, st_id, root_tmp) < 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1219 success = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1220 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1221 octaveroot = root_tmp;
6695 c45431c845f3 [project @ 2007-06-07 21:30:39 by dbateman] dbateman parents: 6657 diff changeset	1222
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1223 H5Tclose (st_id);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1224 }
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1225
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1226 H5Aclose (attr_id);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1227 }
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1228
6695 c45431c845f3 [project @ 2007-06-07 21:30:39 by dbateman] dbateman parents: 6657 diff changeset	1229 if (success)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1230 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1231 attr_id = H5Aopen_name (group_hid, "FILE");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1232 if (attr_id >= 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1233 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1234 H5Tclose (type_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1235 type_hid = H5Aget_type (attr_id);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1236 type_class_hid = H5Tget_class (type_hid);
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1237
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1238 if (type_class_hid != H5T_STRING)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1239 success = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1240 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1241 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1242 slen = H5Tget_size (type_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1243 st_id = H5Tcopy (H5T_C_S1);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1244 H5Tset_size (st_id, slen);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1245 OCTAVE_LOCAL_BUFFER (char, path_tmp, slen);
6695 c45431c845f3 [project @ 2007-06-07 21:30:39 by dbateman] dbateman parents: 6657 diff changeset	1246
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1247 if (H5Aread (attr_id, st_id, path_tmp) < 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1248 success = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1249 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1250 fpath = path_tmp;
6695 c45431c845f3 [project @ 2007-06-07 21:30:39 by dbateman] dbateman parents: 6657 diff changeset	1251
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1252 H5Tclose (st_id);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1253 }
6695 c45431c845f3 [project @ 2007-06-07 21:30:39 by dbateman] dbateman parents: 6657 diff changeset	1254
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1255 H5Aclose (attr_id);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1256 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1257 }
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1258
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1259 // restore error reporting:
21211 2cf8bc5c7017 use "#if defined (HAVE_FOO)" instead of "#if HAVE_FOO" for feature tests John W. Eaton <jwe@octave.org> parents: 21200 diff changeset	1260 #if defined (HAVE_HDF5_18)
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 21017 diff changeset	1261 H5Eset_auto (octave_H5E_DEFAULT, err_func, err_func_data);
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	1262 #else
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1263 H5Eset_auto (err_func, err_func_data);
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	1264 #endif
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1265
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1266 success = (success ? set_fcn (octaveroot, fpath) : success);
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1267 }
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1268
6695 c45431c845f3 [project @ 2007-06-07 21:30:39 by dbateman] dbateman parents: 6657 diff changeset	1269 H5Tclose (type_hid);
c45431c845f3 [project @ 2007-06-07 21:30:39 by dbateman] dbateman parents: 6657 diff changeset	1270 H5Sclose (space_hid);
c45431c845f3 [project @ 2007-06-07 21:30:39 by dbateman] dbateman parents: 6657 diff changeset	1271 H5Gclose (group_hid);
c45431c845f3 [project @ 2007-06-07 21:30:39 by dbateman] dbateman parents: 6657 diff changeset	1272
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1273 return success;
19863 09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	1274
09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	1275 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21580 diff changeset	1276 octave_unused_parameter (loc_id);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21580 diff changeset	1277 octave_unused_parameter (name);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21580 diff changeset	1278
21102 dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	1279 warn_load ("hdf5");
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21580 diff changeset	1280
19863 09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	1281 return false;
09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	1282 #endif
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1283 }
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1284
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11541 diff changeset	1285 /*
23573 1b4f4ec53b4a use new script to tag fixed bugs in tests John W. Eaton <jwe@octave.org> parents: 23572 diff changeset	1286 %!test <*33857>
7744 14b841c47a5f handle load/save for handles to built-in functions John W. Eaton <jwe@octave.org> parents: 7740 diff changeset	1287 %! a = 2;
14b841c47a5f handle load/save for handles to built-in functions John W. Eaton <jwe@octave.org> parents: 7740 diff changeset	1288 %! f = @(x) a + x;
14b841c47a5f handle load/save for handles to built-in functions John W. Eaton <jwe@octave.org> parents: 7740 diff changeset	1289 %! g = @(x) 2 * x;
11541 28bae9cd7ea9 ov-fcn-handle.cc: use version instead of flops in test John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1290 %! hm = @version;
7745 0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7744 diff changeset	1291 %! hdld = @svd;
7744 14b841c47a5f handle load/save for handles to built-in functions John W. Eaton <jwe@octave.org> parents: 7740 diff changeset	1292 %! hbi = @log2;
14b841c47a5f handle load/save for handles to built-in functions John W. Eaton <jwe@octave.org> parents: 7740 diff changeset	1293 %! f2 = f;
14b841c47a5f handle load/save for handles to built-in functions John W. Eaton <jwe@octave.org> parents: 7740 diff changeset	1294 %! g2 = g;
14b841c47a5f handle load/save for handles to built-in functions John W. Eaton <jwe@octave.org> parents: 7740 diff changeset	1295 %! hm2 = hm;
14b841c47a5f handle load/save for handles to built-in functions John W. Eaton <jwe@octave.org> parents: 7740 diff changeset	1296 %! hdld2 = hdld;
14b841c47a5f handle load/save for handles to built-in functions John W. Eaton <jwe@octave.org> parents: 7740 diff changeset	1297 %! hbi2 = hbi;
14b841c47a5f handle load/save for handles to built-in functions John W. Eaton <jwe@octave.org> parents: 7740 diff changeset	1298 %! modes = {"-text", "-binary"};
21434 1da428cbf401 deprecate octave_config_info John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1299 %! if (isfield (__octave_config_info__, "HAVE_HDF5")
1da428cbf401 deprecate octave_config_info John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1300 %! && __octave_config_info__ ("HAVE_HDF5"))
7744 14b841c47a5f handle load/save for handles to built-in functions John W. Eaton <jwe@octave.org> parents: 7740 diff changeset	1301 %! modes(end+1) = "-hdf5";
14b841c47a5f handle load/save for handles to built-in functions John W. Eaton <jwe@octave.org> parents: 7740 diff changeset	1302 %! endif
7901 3e4c9b69069d call stack changes John W. Eaton <jwe@octave.org> parents: 7767 diff changeset	1303 %! for i = 1:numel (modes)
3e4c9b69069d call stack changes John W. Eaton <jwe@octave.org> parents: 7767 diff changeset	1304 %! mode = modes{i};
19278 6ca096827123 Use tempname() rather than tmpnam() in core Octave. Rik <rik@octave.org> parents: 18537 diff changeset	1305 %! nm = tempname ();
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1306 %! unwind_protect
22489 93ea313301f9 test: Add bug ids (<#####>) to BIST tests. Rik <rik@octave.org> parents: 22417 diff changeset	1307 %! f2 (1);
7744 14b841c47a5f handle load/save for handles to built-in functions John W. Eaton <jwe@octave.org> parents: 7740 diff changeset	1308 %! save (mode, nm, "f2", "g2", "hm2", "hdld2", "hbi2");
14b841c47a5f handle load/save for handles to built-in functions John W. Eaton <jwe@octave.org> parents: 7740 diff changeset	1309 %! clear f2 g2 hm2 hdld2 hbi2
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1310 %! load (nm);
14429 eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14175 diff changeset	1311 %! assert (f (2), f2 (2));
eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14175 diff changeset	1312 %! assert (g (2), g2 (2));
eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14175 diff changeset	1313 %! assert (g (3), g2 (3));
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1314 %! unlink (nm);
7744 14b841c47a5f handle load/save for handles to built-in functions John W. Eaton <jwe@octave.org> parents: 7740 diff changeset	1315 %! save (mode, nm, "f2", "g2", "hm2", "hdld2", "hbi2");
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1316 %! unwind_protect_cleanup
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1317 %! unlink (nm);
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1318 %! end_unwind_protect
7744 14b841c47a5f handle load/save for handles to built-in functions John W. Eaton <jwe@octave.org> parents: 7740 diff changeset	1319 %! endfor
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1320 */
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1321
15235 ab3d4c1affee Use correct context when saving anonymous functions (bug #35876) Max Brister <max@2bass.com> parents: 15195 diff changeset	1322 /*
ab3d4c1affee Use correct context when saving anonymous functions (bug #35876) Max Brister <max@2bass.com> parents: 15195 diff changeset	1323 %!function fcn_handle_save_recurse (n, mode, nm, f2, g2, hm2, hdld2, hbi2)
16933 e39f00a32dc7 maint: Use parentheses around condition for switch(),while(),if() statements. Rik <rik@octave.org> parents: 16442 diff changeset	1324 %! if (n == 0)
15235 ab3d4c1affee Use correct context when saving anonymous functions (bug #35876) Max Brister <max@2bass.com> parents: 15195 diff changeset	1325 %! save (mode, nm, "f2", "g2", "hm2", "hdld2", "hbi2");
ab3d4c1affee Use correct context when saving anonymous functions (bug #35876) Max Brister <max@2bass.com> parents: 15195 diff changeset	1326 %! else
ab3d4c1affee Use correct context when saving anonymous functions (bug #35876) Max Brister <max@2bass.com> parents: 15195 diff changeset	1327 %! fcn_handle_save_recurse (n - 1, mode, nm, f2, g2, hm2, hdld2, hbi2);
ab3d4c1affee Use correct context when saving anonymous functions (bug #35876) Max Brister <max@2bass.com> parents: 15195 diff changeset	1328 %! endif
ab3d4c1affee Use correct context when saving anonymous functions (bug #35876) Max Brister <max@2bass.com> parents: 15195 diff changeset	1329 %!endfunction
ab3d4c1affee Use correct context when saving anonymous functions (bug #35876) Max Brister <max@2bass.com> parents: 15195 diff changeset	1330 %!function [f2, g2, hm2, hdld2, hbi2] = fcn_handle_load_recurse (n, nm)
16933 e39f00a32dc7 maint: Use parentheses around condition for switch(),while(),if() statements. Rik <rik@octave.org> parents: 16442 diff changeset	1331 %! if (n == 0)
21580 ecce63c99c3f maint: Add semicolons to terminate code in %! blocks. Rik <rik@octave.org> parents: 21574 diff changeset	1332 %! load (nm);
15235 ab3d4c1affee Use correct context when saving anonymous functions (bug #35876) Max Brister <max@2bass.com> parents: 15195 diff changeset	1333 %! else
ab3d4c1affee Use correct context when saving anonymous functions (bug #35876) Max Brister <max@2bass.com> parents: 15195 diff changeset	1334 %! [f2, g2, hm2, hdld2, hbi2] = fcn_handle_load_recurse (n - 1, nm);
ab3d4c1affee Use correct context when saving anonymous functions (bug #35876) Max Brister <max@2bass.com> parents: 15195 diff changeset	1335 %! endif
ab3d4c1affee Use correct context when saving anonymous functions (bug #35876) Max Brister <max@2bass.com> parents: 15195 diff changeset	1336 %!endfunction
ab3d4c1affee Use correct context when saving anonymous functions (bug #35876) Max Brister <max@2bass.com> parents: 15195 diff changeset	1337
23573 1b4f4ec53b4a use new script to tag fixed bugs in tests John W. Eaton <jwe@octave.org> parents: 23572 diff changeset	1338 %!test <*35876>
15235 ab3d4c1affee Use correct context when saving anonymous functions (bug #35876) Max Brister <max@2bass.com> parents: 15195 diff changeset	1339 %! a = 2;
ab3d4c1affee Use correct context when saving anonymous functions (bug #35876) Max Brister <max@2bass.com> parents: 15195 diff changeset	1340 %! f = @(x) a + x;
ab3d4c1affee Use correct context when saving anonymous functions (bug #35876) Max Brister <max@2bass.com> parents: 15195 diff changeset	1341 %! g = @(x) 2 * x;
ab3d4c1affee Use correct context when saving anonymous functions (bug #35876) Max Brister <max@2bass.com> parents: 15195 diff changeset	1342 %! hm = @version;
ab3d4c1affee Use correct context when saving anonymous functions (bug #35876) Max Brister <max@2bass.com> parents: 15195 diff changeset	1343 %! hdld = @svd;
ab3d4c1affee Use correct context when saving anonymous functions (bug #35876) Max Brister <max@2bass.com> parents: 15195 diff changeset	1344 %! hbi = @log2;
ab3d4c1affee Use correct context when saving anonymous functions (bug #35876) Max Brister <max@2bass.com> parents: 15195 diff changeset	1345 %! f2 = f;
ab3d4c1affee Use correct context when saving anonymous functions (bug #35876) Max Brister <max@2bass.com> parents: 15195 diff changeset	1346 %! g2 = g;
ab3d4c1affee Use correct context when saving anonymous functions (bug #35876) Max Brister <max@2bass.com> parents: 15195 diff changeset	1347 %! hm2 = hm;
ab3d4c1affee Use correct context when saving anonymous functions (bug #35876) Max Brister <max@2bass.com> parents: 15195 diff changeset	1348 %! hdld2 = hdld;
ab3d4c1affee Use correct context when saving anonymous functions (bug #35876) Max Brister <max@2bass.com> parents: 15195 diff changeset	1349 %! hbi2 = hbi;
ab3d4c1affee Use correct context when saving anonymous functions (bug #35876) Max Brister <max@2bass.com> parents: 15195 diff changeset	1350 %! modes = {"-text", "-binary"};
21434 1da428cbf401 deprecate octave_config_info John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1351 %! if (isfield (__octave_config_info__, "HAVE_HDF5")
1da428cbf401 deprecate octave_config_info John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1352 %! && __octave_config_info__ ("HAVE_HDF5"))
15235 ab3d4c1affee Use correct context when saving anonymous functions (bug #35876) Max Brister <max@2bass.com> parents: 15195 diff changeset	1353 %! modes(end+1) = "-hdf5";
ab3d4c1affee Use correct context when saving anonymous functions (bug #35876) Max Brister <max@2bass.com> parents: 15195 diff changeset	1354 %! endif
ab3d4c1affee Use correct context when saving anonymous functions (bug #35876) Max Brister <max@2bass.com> parents: 15195 diff changeset	1355 %! for i = 1:numel (modes)
ab3d4c1affee Use correct context when saving anonymous functions (bug #35876) Max Brister <max@2bass.com> parents: 15195 diff changeset	1356 %! mode = modes{i};
19278 6ca096827123 Use tempname() rather than tmpnam() in core Octave. Rik <rik@octave.org> parents: 18537 diff changeset	1357 %! nm = tempname ();
15235 ab3d4c1affee Use correct context when saving anonymous functions (bug #35876) Max Brister <max@2bass.com> parents: 15195 diff changeset	1358 %! unwind_protect
ab3d4c1affee Use correct context when saving anonymous functions (bug #35876) Max Brister <max@2bass.com> parents: 15195 diff changeset	1359 %! fcn_handle_save_recurse (2, mode, nm, f2, g2, hm2, hdld2, hbi2);
ab3d4c1affee Use correct context when saving anonymous functions (bug #35876) Max Brister <max@2bass.com> parents: 15195 diff changeset	1360 %! clear f2 g2 hm2 hdld2 hbi2
ab3d4c1affee Use correct context when saving anonymous functions (bug #35876) Max Brister <max@2bass.com> parents: 15195 diff changeset	1361 %! [f2, f2, hm2, hdld2, hbi2] = fcn_handle_load_recurse (2, nm);
ab3d4c1affee Use correct context when saving anonymous functions (bug #35876) Max Brister <max@2bass.com> parents: 15195 diff changeset	1362 %! load (nm);
ab3d4c1affee Use correct context when saving anonymous functions (bug #35876) Max Brister <max@2bass.com> parents: 15195 diff changeset	1363 %! assert (f (2), f2 (2));
ab3d4c1affee Use correct context when saving anonymous functions (bug #35876) Max Brister <max@2bass.com> parents: 15195 diff changeset	1364 %! assert (g (2), g2 (2));
ab3d4c1affee Use correct context when saving anonymous functions (bug #35876) Max Brister <max@2bass.com> parents: 15195 diff changeset	1365 %! assert (g (3), g2 (3));
ab3d4c1affee Use correct context when saving anonymous functions (bug #35876) Max Brister <max@2bass.com> parents: 15195 diff changeset	1366 %! unlink (nm);
ab3d4c1affee Use correct context when saving anonymous functions (bug #35876) Max Brister <max@2bass.com> parents: 15195 diff changeset	1367 %! fcn_handle_save_recurse (2, mode, nm, f2, g2, hm2, hdld2, hbi2);
ab3d4c1affee Use correct context when saving anonymous functions (bug #35876) Max Brister <max@2bass.com> parents: 15195 diff changeset	1368 %! unwind_protect_cleanup
ab3d4c1affee Use correct context when saving anonymous functions (bug #35876) Max Brister <max@2bass.com> parents: 15195 diff changeset	1369 %! unlink (nm);
ab3d4c1affee Use correct context when saving anonymous functions (bug #35876) Max Brister <max@2bass.com> parents: 15195 diff changeset	1370 %! end_unwind_protect
ab3d4c1affee Use correct context when saving anonymous functions (bug #35876) Max Brister <max@2bass.com> parents: 15195 diff changeset	1371 %! endfor
ab3d4c1affee Use correct context when saving anonymous functions (bug #35876) Max Brister <max@2bass.com> parents: 15195 diff changeset	1372 */
ab3d4c1affee Use correct context when saving anonymous functions (bug #35876) Max Brister <max@2bass.com> parents: 15195 diff changeset	1373
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1374 void
18416 bcd71a2531d3 Support disp/display overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18409 diff changeset	1375 octave_fcn_handle::print (std::ostream& os, bool pr_as_read_syntax)
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1376 {
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1377 print_raw (os, pr_as_read_syntax);
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1378 newline (os);
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1379 }
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1380
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1381 void
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1382 octave_fcn_handle::print_raw (std::ostream& os, bool pr_as_read_syntax) const
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1383 {
4980 003bbf6c13d8 [project @ 2004-09-09 15:47:17 by jwe] jwe parents: 4978 diff changeset	1384 bool printed = false;
003bbf6c13d8 [project @ 2004-09-09 15:47:17 by jwe] jwe parents: 4978 diff changeset	1385
10261 a4fb4675accb make printing of handles more Matlab-compatible Jaroslav Hajek <highegg@gmail.com> parents: 10250 diff changeset	1386 if (nm == anonymous)
4980 003bbf6c13d8 [project @ 2004-09-09 15:47:17 by jwe] jwe parents: 4978 diff changeset	1387 {
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	1388 octave::tree_print_code tpc (os);
4980 003bbf6c13d8 [project @ 2004-09-09 15:47:17 by jwe] jwe parents: 4978 diff changeset	1389
4989 19b73a80e1d9 [project @ 2004-09-11 13:31:43 by jwe] jwe parents: 4988 diff changeset	1390 // FCN is const because this member function is, so we can't
4980 003bbf6c13d8 [project @ 2004-09-09 15:47:17 by jwe] jwe parents: 4978 diff changeset	1391 // use it to call user_function_value, so we make a copy first.
003bbf6c13d8 [project @ 2004-09-09 15:47:17 by jwe] jwe parents: 4978 diff changeset	1392
003bbf6c13d8 [project @ 2004-09-09 15:47:17 by jwe] jwe parents: 4978 diff changeset	1393 octave_value ftmp = fcn;
003bbf6c13d8 [project @ 2004-09-09 15:47:17 by jwe] jwe parents: 4978 diff changeset	1394
003bbf6c13d8 [project @ 2004-09-09 15:47:17 by jwe] jwe parents: 4978 diff changeset	1395 octave_user_function *f = ftmp.user_function_value ();
003bbf6c13d8 [project @ 2004-09-09 15:47:17 by jwe] jwe parents: 4978 diff changeset	1396
003bbf6c13d8 [project @ 2004-09-09 15:47:17 by jwe] jwe parents: 4978 diff changeset	1397 if (f)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1398 {
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	1399 octave::tree_parameter_list *p = f->parameter_list ();
4980 003bbf6c13d8 [project @ 2004-09-09 15:47:17 by jwe] jwe parents: 4978 diff changeset	1400
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1401 os << "@(";
4980 003bbf6c13d8 [project @ 2004-09-09 15:47:17 by jwe] jwe parents: 4978 diff changeset	1402
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1403 if (p)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1404 p->accept (tpc);
4980 003bbf6c13d8 [project @ 2004-09-09 15:47:17 by jwe] jwe parents: 4978 diff changeset	1405
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1406 os << ") ";
4980 003bbf6c13d8 [project @ 2004-09-09 15:47:17 by jwe] jwe parents: 4978 diff changeset	1407
23600 db947ba52118 explicitly limit anonymous functions to a single expression John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	1408 octave::tree_statement_list *b = f->body ();
db947ba52118 explicitly limit anonymous functions to a single expression John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	1409
db947ba52118 explicitly limit anonymous functions to a single expression John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	1410 assert (b->length () == 1);
db947ba52118 explicitly limit anonymous functions to a single expression John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	1411
db947ba52118 explicitly limit anonymous functions to a single expression John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	1412 octave::tree_statement *s = b->front ();
db947ba52118 explicitly limit anonymous functions to a single expression John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	1413
db947ba52118 explicitly limit anonymous functions to a single expression John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	1414 if (s)
db947ba52118 explicitly limit anonymous functions to a single expression John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	1415 {
db947ba52118 explicitly limit anonymous functions to a single expression John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	1416 assert (s->is_expression ());
db947ba52118 explicitly limit anonymous functions to a single expression John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	1417
db947ba52118 explicitly limit anonymous functions to a single expression John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	1418 octave::tree_expression *e = s->expression ();
db947ba52118 explicitly limit anonymous functions to a single expression John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	1419
db947ba52118 explicitly limit anonymous functions to a single expression John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	1420 if (e)
db947ba52118 explicitly limit anonymous functions to a single expression John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	1421 tpc.print_fcn_handle_body (e);
db947ba52118 explicitly limit anonymous functions to a single expression John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	1422 }
4980 003bbf6c13d8 [project @ 2004-09-09 15:47:17 by jwe] jwe parents: 4978 diff changeset	1423
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1424 printed = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1425 }
4980 003bbf6c13d8 [project @ 2004-09-09 15:47:17 by jwe] jwe parents: 4978 diff changeset	1426 }
003bbf6c13d8 [project @ 2004-09-09 15:47:17 by jwe] jwe parents: 4978 diff changeset	1427
003bbf6c13d8 [project @ 2004-09-09 15:47:17 by jwe] jwe parents: 4978 diff changeset	1428 if (! printed)
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23796 diff changeset	1429 octave_print_internal (os, '@' + nm, pr_as_read_syntax,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1430 current_print_indent_level ());
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1431 }
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1432
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1433 octave_value
9463 d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9458 diff changeset	1434 make_fcn_handle (const std::string& nm, bool local_funcs)
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1435 {
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1436 octave_value retval;
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1437
9342 2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1438 // Bow to the god of compatibility.
2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1439
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1440 // FIXME: it seems ugly to put this here, but there is no single
9342 2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1441 // function in the parser that converts from the operator name to
2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1442 // the corresponding function name. At least try to do it without N
2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1443 // string compares.
2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1444
2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1445 std::string tnm = nm;
2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1446
2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1447 size_t len = nm.length ();
2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1448
2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1449 if (len == 3 && nm == ".**")
2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1450 tnm = "power";
2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1451 else if (len == 2)
2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1452 {
2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1453 if (nm[0] == '.')
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1454 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1455 switch (nm[1])
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1456 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1457 case '\'':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1458 tnm = "transpose";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1459 break;
9342 2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1460
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1461 case '+':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1462 tnm = "plus";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1463 break;
9342 2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1464
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1465 case '-':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1466 tnm = "minus";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1467 break;
9342 2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1468
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1469 case '*':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1470 tnm = "times";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1471 break;
9342 2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1472
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1473 case '/':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1474 tnm = "rdivide";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1475 break;
9342 2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1476
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1477 case '^':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1478 tnm = "power";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1479 break;
9342 2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1480
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1481 case '\\':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1482 tnm = "ldivide";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1483 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1484 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1485 }
9342 2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1486 else if (nm[1] == '=')
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1487 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1488 switch (nm[0])
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1489 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1490 case '<':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1491 tnm = "le";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1492 break;
9342 2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1493
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1494 case '=':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1495 tnm = "eq";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1496 break;
9342 2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1497
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1498 case '>':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1499 tnm = "ge";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1500 break;
9342 2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1501
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1502 case '~':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1503 case '!':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1504 tnm = "ne";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1505 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1506 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1507 }
9342 2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1508 else if (nm == "**")
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1509 tnm = "mpower";
9342 2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1510 }
2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1511 else if (len == 1)
2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1512 {
2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1513 switch (nm[0])
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1514 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1515 case '~':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1516 case '!':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1517 tnm = "not";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1518 break;
9342 2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1519
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1520 case '\'':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1521 tnm = "ctranspose";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1522 break;
9342 2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1523
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1524 case '+':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1525 tnm = "plus";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1526 break;
9342 2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1527
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1528 case '-':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1529 tnm = "minus";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1530 break;
9342 2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1531
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1532 case '*':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1533 tnm = "mtimes";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1534 break;
9342 2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1535
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1536 case '/':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1537 tnm = "mrdivide";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1538 break;
9342 2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1539
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1540 case '^':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1541 tnm = "mpower";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1542 break;
9342 2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1543
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1544 case '\\':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1545 tnm = "mldivide";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1546 break;
9342 2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1547
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1548 case '<':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1549 tnm = "lt";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1550 break;
9342 2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1551
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1552 case '>':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1553 tnm = "gt";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1554 break;
9342 2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1555
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1556 case '&':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1557 tnm = "and";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1558 break;
9342 2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1559
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1560 case '\|':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1561 tnm = "or";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1562 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1563 }
9342 2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1564 }
2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1565
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	1566 octave::symbol_table& symtab = octave::__get_symbol_table__ ("make_fcn_handle");
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23573 diff changeset	1567
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23573 diff changeset	1568 octave_value f = symtab.find_function (tnm, octave_value_list (),
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23573 diff changeset	1569 local_funcs);
11220 883b9308353c allow class function to be called from methods as well as constructors John W. Eaton <jwe@octave.org> parents: 11060 diff changeset	1570
10321 97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1571 octave_function *fptr = f.function_value (true);
9458 0c7d84a65386 allow taking handles of methods with no base overload Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	1572
11220 883b9308353c allow class function to be called from methods as well as constructors John W. Eaton <jwe@octave.org> parents: 11060 diff changeset	1573 // Here we are just looking to see if FCN is a method or constructor
883b9308353c allow class function to be called from methods as well as constructors John W. Eaton <jwe@octave.org> parents: 11060 diff changeset	1574 // for any class.
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11541 diff changeset	1575 if (local_funcs && fptr
11461 2b8531a6a3c9 Change mentions of "nested function" to the less misleading "subfunction" David Grundberg <individ@acc.umu.se> parents: 11223 diff changeset	1576 && (fptr->is_subfunction () \|\| fptr->is_private_function ()
18441 b0aba84cf80f Support handle to classdef constructor. Michael Goffioul <michael.goffioul@gmail.com> parents: 18416 diff changeset	1577 \|\| fptr->is_class_constructor ()
b0aba84cf80f Support handle to classdef constructor. Michael Goffioul <michael.goffioul@gmail.com> parents: 18416 diff changeset	1578 \|\| fptr->is_classdef_constructor ()))
9458 0c7d84a65386 allow taking handles of methods with no base overload Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	1579 {
10321 97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1580 // Locally visible function.
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1581 retval = octave_value (new octave_fcn_handle (f, tnm));
9458 0c7d84a65386 allow taking handles of methods with no base overload Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	1582 }
0c7d84a65386 allow taking handles of methods with no base overload Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	1583 else
10321 97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1584 {
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1585 octave::load_path& lp = octave::__get_load_path__ ("make_fcn_handle");
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	1586
21751 b571fc85953f maint: Use two spaces after period to indicate sentence break. Rik <rik@octave.org> parents: 21745 diff changeset	1587 // Globally visible (or no match yet). Query overloads.
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	1588 std::list<std::string> classes = lp.overloads (tnm);
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23717 diff changeset	1589 bool any_match = fptr != nullptr \|\| classes.size () > 0;
10321 97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1590 if (! any_match)
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1591 {
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1592 // No match found, try updating load_path and query classes again.
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	1593 lp.update ();
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	1594 classes = lp.overloads (tnm);
10321 97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1595 any_match = classes.size () > 0;
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1596 }
9458 0c7d84a65386 allow taking handles of methods with no base overload Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	1597
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20957 diff changeset	1598 if (! any_match)
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20957 diff changeset	1599 error ("@%s: no function and no method found", tnm.c_str ());
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20957 diff changeset	1600
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20957 diff changeset	1601 octave_fcn_handle *fh = new octave_fcn_handle (f, tnm);
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20957 diff changeset	1602 retval = fh;
10321 97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1603
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22755 diff changeset	1604 for (auto& cls : classes)
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20957 diff changeset	1605 {
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22755 diff changeset	1606 std::string class_name = cls;
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23573 diff changeset	1607 octave_value fmeth = symtab.find_method (tnm, class_name);
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20957 diff changeset	1608
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20957 diff changeset	1609 bool is_builtin = false;
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20957 diff changeset	1610 for (int i = 0; i < btyp_num_types; i++)
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9419 diff changeset	1611 {
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20957 diff changeset	1612 // FIXME: Too slow? Maybe binary lookup?
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20957 diff changeset	1613 if (class_name == btyp_class_name[i])
10321 97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1614 {
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20957 diff changeset	1615 is_builtin = true;
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20957 diff changeset	1616 fh->set_overload (static_cast<builtin_type_t> (i), fmeth);
10321 97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1617 }
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20957 diff changeset	1618 }
10321 97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1619
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20957 diff changeset	1620 if (! is_builtin)
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20957 diff changeset	1621 fh->set_overload (class_name, fmeth);
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9419 diff changeset	1622 }
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9419 diff changeset	1623 }
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1624
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1625 return retval;
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1626 }
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1627
9342 2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1628 /*
2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1629 %!test
2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1630 %! x = {".**", "power";
2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1631 %! ".'", "transpose";
2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1632 %! ".+", "plus";
2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1633 %! ".-", "minus";
2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1634 %! ".*", "times";
2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1635 %! "./", "rdivide";
2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1636 %! ".^", "power";
2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1637 %! ".\\", "ldivide";
2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1638 %! "<=", "le";
2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1639 %! "==", "eq";
2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1640 %! ">=", "ge";
2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1641 %! "~=", "ne";
2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1642 %! "!=", "ne";
2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1643 %! "**", "mpower";
2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1644 %! "~", "not";
2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1645 %! "!", "not";
2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1646 %! "\'", "ctranspose";
2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1647 %! "+", "plus";
2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1648 %! "-", "minus";
2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1649 %! "*", "mtimes";
2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1650 %! "/", "mrdivide";
2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1651 %! "^", "mpower";
2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1652 %! "\\", "mldivide";
2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1653 %! "<", "lt";
9343 70e0d3b1f26f fix typos in previous change John W. Eaton <jwe@octave.org> parents: 9342 diff changeset	1654 %! ">", "gt";
9342 2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1655 %! "&", "and";
2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1656 %! "\|", "or"};
2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1657 %! for i = 1:rows (x)
14429 eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14175 diff changeset	1658 %! assert (functions (str2func (x{i,1})).function, x{i,2});
9342 2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1659 %! endfor
2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1660 */
2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1661
23611 91c8f006ed8b remove additional functions from symbol_table class John W. Eaton <jwe@octave.org> parents: 23603 diff changeset	1662 DEFUN (functions, args, ,
91c8f006ed8b remove additional functions from symbol_table class John W. Eaton <jwe@octave.org> parents: 23603 diff changeset	1663 doc: /* -- texinfo --
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	1664 @deftypefn {} {@var{s} =} functions (@var{fcn_handle})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	1665 Return a structure containing information about the function handle
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	1666 @var{fcn_handle}.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	1667
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	1668 The structure @var{s} always contains these three fields:
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	1669
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	1670 @table @asis
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	1671 @item function
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	1672 The function name. For an anonymous function (no name) this will be the
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	1673 actual function definition.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	1674
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	1675 @item type
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	1676 Type of the function.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	1677
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	1678 @table @asis
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	1679 @item anonymous
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	1680 The function is anonymous.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	1681
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	1682 @item private
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	1683 The function is private.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	1684
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	1685 @item overloaded
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	1686 The function overloads an existing function.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	1687
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	1688 @item simple
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	1689 The function is a built-in or m-file function.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	1690
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	1691 @item subfunction
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	1692 The function is a subfunction within an m-file.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	1693 @end table
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	1694
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	1695 @item file
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	1696 The m-file that will be called to perform the function. This field is empty
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	1697 for anonymous and built-in functions.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	1698 @end table
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	1699
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	1700 In addition, some function types may return more information in additional
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	1701 fields.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	1702
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	1703 @strong{Warning:} @code{functions} is provided for debugging purposes only.
22982 aca714a80cfc doc: Add more sealso links between docstrings. Rik <rik@octave.org> parents: 22489 diff changeset	1704 Its behavior may change in the future and programs should not depend on any
aca714a80cfc doc: Add more sealso links between docstrings. Rik <rik@octave.org> parents: 22489 diff changeset	1705 particular output format.
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	1706
22982 aca714a80cfc doc: Add more sealso links between docstrings. Rik <rik@octave.org> parents: 22489 diff changeset	1707 @seealso{func2str, str2func}
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	1708 @end deftypefn */)
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1709 {
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1710 if (args.length () != 1)
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1711 print_usage ();
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1712
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1713 octave_fcn_handle *fh = args(0).fcn_handle_value ("functions: FCN_HANDLE argument must be a function handle object");
4649 f7ce581b27fb [project @ 2003-11-23 21:46:44 by jwe] jwe parents: 4612 diff changeset	1714
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23717 diff changeset	1715 octave_function *fcn = (fh ? fh->function_value () : nullptr);
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: 4930 diff changeset	1716
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	1717 if (! fcn)
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	1718 error ("functions: FCN_HANDLE is not a valid function handle object");
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1719
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	1720 octave_scalar_map m;
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: 4930 diff changeset	1721
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	1722 std::string fh_nm = fh->fcn_name ();
7767 71f068b22fcc scope and context fixes for function handles John W. Eaton <jwe@octave.org> parents: 7761 diff changeset	1723
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	1724 if (fh_nm == octave_fcn_handle::anonymous)
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	1725 {
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	1726 std::ostringstream buf;
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	1727 fh->print_raw (buf);
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	1728 m.setfield ("function", buf.str ());
7767 71f068b22fcc scope and context fixes for function handles John W. Eaton <jwe@octave.org> parents: 7761 diff changeset	1729
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	1730 m.setfield ("type", "anonymous");
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1731 }
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1732 else
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	1733 {
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	1734 m.setfield ("function", fh_nm);
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	1735
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	1736 if (fcn->is_subfunction ())
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	1737 {
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	1738 m.setfield ("type", "subfunction");
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	1739 Cell parentage (dim_vector (1, 2));
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	1740 parentage.elem (0) = fh_nm;
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	1741 parentage.elem (1) = fcn->parent_fcn_name ();
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	1742 m.setfield ("parentage", octave_value (parentage));
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	1743 }
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	1744 else if (fcn->is_private_function ())
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	1745 m.setfield ("type", "private");
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	1746 else if (fh->is_overloaded ())
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	1747 m.setfield ("type", "overloaded");
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	1748 else
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	1749 m.setfield ("type", "simple");
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	1750 }
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	1751
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	1752 std::string nm = fcn->fcn_file_name ();
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	1753
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	1754 if (fh_nm == octave_fcn_handle::anonymous)
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	1755 {
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	1756 m.setfield ("file", nm);
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	1757
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	1758 std::list<octave::symbol_table::symbol_record> vars;
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1759
23611 91c8f006ed8b remove additional functions from symbol_table class John W. Eaton <jwe@octave.org> parents: 23603 diff changeset	1760 octave_user_function *fu = fh->user_function_value ();
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	1761 octave::symbol_table::scope *fu_scope = fu->scope ();
23611 91c8f006ed8b remove additional functions from symbol_table class John W. Eaton <jwe@octave.org> parents: 23603 diff changeset	1762 if (fu_scope)
91c8f006ed8b remove additional functions from symbol_table class John W. Eaton <jwe@octave.org> parents: 23603 diff changeset	1763 vars = fu_scope->all_variables ();
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	1764
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	1765 size_t varlen = vars.size ();
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	1766
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	1767 if (varlen > 0)
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	1768 {
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	1769 octave_scalar_map ws;
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22755 diff changeset	1770 for (const auto& symrec : vars)
23603 18bd46c4b79a make symbol table context info mostly local to symbol table scopes John W. Eaton <jwe@octave.org> parents: 23602 diff changeset	1771 ws.assign (symrec.name (), symrec.varval ());
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	1772
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	1773 m.setfield ("workspace", ws);
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	1774 }
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	1775 }
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	1776 else if (fcn->is_user_function () \|\| fcn->is_user_script ())
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	1777 {
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	1778 octave_function *fu = fh->function_value ();
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	1779 m.setfield ("file", fu->fcn_file_name ());
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	1780 }
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	1781 else
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	1782 m.setfield ("file", "");
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	1783
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	1784 return ovl (m);
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1785 }
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1786
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: 4930 diff changeset	1787 DEFUN (func2str, args, ,
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	1788 doc: /* -- texinfo --
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	1789 @deftypefn {} {} func2str (@var{fcn_handle})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	1790 Return a string containing the name of the function referenced by the
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	1791 function handle @var{fcn_handle}.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	1792 @seealso{str2func, functions}
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	1793 @end deftypefn */)
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1794 {
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1795 if (args.length () != 1)
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1796 print_usage ();
4930 bdb307dc8613 [project @ 2004-08-05 04:55:26 by jwe] jwe parents: 4925 diff changeset	1797
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1798 octave_fcn_handle *fh = args(0).fcn_handle_value ("func2str: FCN_HANDLE argument must be a function handle object");
6416 59a4304b7cc5 [project @ 2007-03-15 20:37:44 by jwe] jwe parents: 6351 diff changeset	1799
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	1800 if (! fh)
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	1801 error ("func2str: FCN_HANDLE must be a valid function handle");
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	1802
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1803 octave_value retval;
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1804
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	1805 std::string fh_nm = fh->fcn_name ();
6416 59a4304b7cc5 [project @ 2007-03-15 20:37:44 by jwe] jwe parents: 6351 diff changeset	1806
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	1807 if (fh_nm == octave_fcn_handle::anonymous)
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	1808 {
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	1809 std::ostringstream buf;
6416 59a4304b7cc5 [project @ 2007-03-15 20:37:44 by jwe] jwe parents: 6351 diff changeset	1810
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	1811 fh->print_raw (buf);
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1812
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	1813 retval = buf.str ();
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1814 }
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1815 else
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	1816 retval = fh_nm;
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1817
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1818 return retval;
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1819 }
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1820
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: 4930 diff changeset	1821 DEFUN (str2func, args, ,
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	1822 doc: /* -- texinfo --
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	1823 @deftypefn {} {} str2func (@var{fcn_name})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	1824 @deftypefnx {} {} str2func (@var{fcn_name}, "global")
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	1825 Return a function handle constructed from the string @var{fcn_name}.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	1826
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	1827 If the optional @qcode{"global"} argument is passed, locally visible
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	1828 functions are ignored in the lookup.
22982 aca714a80cfc doc: Add more sealso links between docstrings. Rik <rik@octave.org> parents: 22489 diff changeset	1829 @seealso{func2str, inline, functions}
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	1830 @end deftypefn */)
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1831 {
9463 d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9458 diff changeset	1832 int nargin = args.length ();
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1833
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1834 if (nargin < 1 \|\| nargin > 2)
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1835 print_usage ();
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1836
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1837 std::string nm = args(0).xstring_value ("str2func: FCN_NAME must be a string");
20580 729a85dafba8 use new string_value method to handle value extraction errors John W. Eaton <jwe@octave.org> parents: 20555 diff changeset	1838
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	1839 octave_value retval;
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	1840
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1841 if (nm[0] == '@')
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1842 {
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1843 int parse_status;
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	1844 octave_value anon_fcn_handle
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	1845 = octave::eval_string (nm, true, parse_status);
20508 df7d34a1c7e6 str2func: Allow anonymous function string inputs (bug #45682). Rik <rik@octave.org> parents: 20501 diff changeset	1846
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1847 if (parse_status == 0)
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1848 retval = anon_fcn_handle;
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1849 }
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1850 else
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1851 retval = make_fcn_handle (nm, nargin != 2);
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1852
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1853 return retval;
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1854 }
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1855
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1856 /*
20508 df7d34a1c7e6 str2func: Allow anonymous function string inputs (bug #45682). Rik <rik@octave.org> parents: 20501 diff changeset	1857 %!test
df7d34a1c7e6 str2func: Allow anonymous function string inputs (bug #45682). Rik <rik@octave.org> parents: 20501 diff changeset	1858 %! f = str2func ("<");
df7d34a1c7e6 str2func: Allow anonymous function string inputs (bug #45682). Rik <rik@octave.org> parents: 20501 diff changeset	1859 %! assert (class (f), "function_handle");
df7d34a1c7e6 str2func: Allow anonymous function string inputs (bug #45682). Rik <rik@octave.org> parents: 20501 diff changeset	1860 %! assert (func2str (f), "lt");
df7d34a1c7e6 str2func: Allow anonymous function string inputs (bug #45682). Rik <rik@octave.org> parents: 20501 diff changeset	1861 %! assert (f (1, 2), true);
df7d34a1c7e6 str2func: Allow anonymous function string inputs (bug #45682). Rik <rik@octave.org> parents: 20501 diff changeset	1862 %! assert (f (2, 1), false);
df7d34a1c7e6 str2func: Allow anonymous function string inputs (bug #45682). Rik <rik@octave.org> parents: 20501 diff changeset	1863
df7d34a1c7e6 str2func: Allow anonymous function string inputs (bug #45682). Rik <rik@octave.org> parents: 20501 diff changeset	1864 %!test
df7d34a1c7e6 str2func: Allow anonymous function string inputs (bug #45682). Rik <rik@octave.org> parents: 20501 diff changeset	1865 %! f = str2func ("@(x) sin (x)");
df7d34a1c7e6 str2func: Allow anonymous function string inputs (bug #45682). Rik <rik@octave.org> parents: 20501 diff changeset	1866 %! assert (func2str (f), "@(x) sin (x)");
df7d34a1c7e6 str2func: Allow anonymous function string inputs (bug #45682). Rik <rik@octave.org> parents: 20501 diff changeset	1867 %! assert (f (0:3), sin (0:3));
df7d34a1c7e6 str2func: Allow anonymous function string inputs (bug #45682). Rik <rik@octave.org> parents: 20501 diff changeset	1868
df7d34a1c7e6 str2func: Allow anonymous function string inputs (bug #45682). Rik <rik@octave.org> parents: 20501 diff changeset	1869 %!error <FCN_NAME must be a string> str2func ({"sin"})
df7d34a1c7e6 str2func: Allow anonymous function string inputs (bug #45682). Rik <rik@octave.org> parents: 20501 diff changeset	1870 */
df7d34a1c7e6 str2func: Allow anonymous function string inputs (bug #45682). Rik <rik@octave.org> parents: 20501 diff changeset	1871
df7d34a1c7e6 str2func: Allow anonymous function string inputs (bug #45682). Rik <rik@octave.org> parents: 20501 diff changeset	1872 /*
14085 4e8f23ccadce test: Use internal prefix "__" for %!functions to avoid polluting workspace Rik <octave@nomad.inbox5.com> parents: 13696 diff changeset	1873 %!function y = __testrecursionfunc (f, x, n)
7767 71f068b22fcc scope and context fixes for function handles John W. Eaton <jwe@octave.org> parents: 7761 diff changeset	1874 %! if (nargin < 3)
71f068b22fcc scope and context fixes for function handles John W. Eaton <jwe@octave.org> parents: 7761 diff changeset	1875 %! n = 0;
71f068b22fcc scope and context fixes for function handles John W. Eaton <jwe@octave.org> parents: 7761 diff changeset	1876 %! endif
71f068b22fcc scope and context fixes for function handles John W. Eaton <jwe@octave.org> parents: 7761 diff changeset	1877 %! if (n > 2)
71f068b22fcc scope and context fixes for function handles John W. Eaton <jwe@octave.org> parents: 7761 diff changeset	1878 %! y = f (x);
71f068b22fcc scope and context fixes for function handles John W. Eaton <jwe@octave.org> parents: 7761 diff changeset	1879 %! else
71f068b22fcc scope and context fixes for function handles John W. Eaton <jwe@octave.org> parents: 7761 diff changeset	1880 %! n++;
14429 eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14175 diff changeset	1881 %! y = __testrecursionfunc (@(x) f (2*x), x, n);
7767 71f068b22fcc scope and context fixes for function handles John W. Eaton <jwe@octave.org> parents: 7761 diff changeset	1882 %! endif
14085 4e8f23ccadce test: Use internal prefix "__" for %!functions to avoid polluting workspace Rik <octave@nomad.inbox5.com> parents: 13696 diff changeset	1883 %!endfunction
4e8f23ccadce test: Use internal prefix "__" for %!functions to avoid polluting workspace Rik <octave@nomad.inbox5.com> parents: 13696 diff changeset	1884 %!
4e8f23ccadce test: Use internal prefix "__" for %!functions to avoid polluting workspace Rik <octave@nomad.inbox5.com> parents: 13696 diff changeset	1885 %!assert (__testrecursionfunc (@(x) x, 1), 8)
7767 71f068b22fcc scope and context fixes for function handles John W. Eaton <jwe@octave.org> parents: 7761 diff changeset	1886 */
10960 409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1887
14175 3972c4caa60a Add new function is_function_handle (patch #7695) Juan Pablo Carbajal <carbajal@ifi.uzh.ch> parents: 14138 diff changeset	1888 DEFUN (is_function_handle, args, ,
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	1889 doc: /* -- texinfo --
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	1890 @deftypefn {} {} is_function_handle (@var{x})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	1891 Return true if @var{x} is a function handle.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	1892 @seealso{isa, typeinfo, class, functions}
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	1893 @end deftypefn */)
14175 3972c4caa60a Add new function is_function_handle (patch #7695) Juan Pablo Carbajal <carbajal@ifi.uzh.ch> parents: 14138 diff changeset	1894 {
20818 cef0448a6ed2 eliminate unnecessary uses of nargin John W. Eaton <jwe@octave.org> parents: 20797 diff changeset	1895 if (args.length () != 1)
14175 3972c4caa60a Add new function is_function_handle (patch #7695) Juan Pablo Carbajal <carbajal@ifi.uzh.ch> parents: 14138 diff changeset	1896 print_usage ();
3972c4caa60a Add new function is_function_handle (patch #7695) Juan Pablo Carbajal <carbajal@ifi.uzh.ch> parents: 14138 diff changeset	1897
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	1898 return ovl (args(0).is_function_handle ());
14175 3972c4caa60a Add new function is_function_handle (patch #7695) Juan Pablo Carbajal <carbajal@ifi.uzh.ch> parents: 14138 diff changeset	1899 }
3972c4caa60a Add new function is_function_handle (patch #7695) Juan Pablo Carbajal <carbajal@ifi.uzh.ch> parents: 14138 diff changeset	1900
3972c4caa60a Add new function is_function_handle (patch #7695) Juan Pablo Carbajal <carbajal@ifi.uzh.ch> parents: 14138 diff changeset	1901 /*
3972c4caa60a Add new function is_function_handle (patch #7695) Juan Pablo Carbajal <carbajal@ifi.uzh.ch> parents: 14138 diff changeset	1902 %!shared fh
3972c4caa60a Add new function is_function_handle (patch #7695) Juan Pablo Carbajal <carbajal@ifi.uzh.ch> parents: 14138 diff changeset	1903 %! fh = @(x) x;
3972c4caa60a Add new function is_function_handle (patch #7695) Juan Pablo Carbajal <carbajal@ifi.uzh.ch> parents: 14138 diff changeset	1904
3972c4caa60a Add new function is_function_handle (patch #7695) Juan Pablo Carbajal <carbajal@ifi.uzh.ch> parents: 14138 diff changeset	1905 %!assert (is_function_handle (fh))
3972c4caa60a Add new function is_function_handle (patch #7695) Juan Pablo Carbajal <carbajal@ifi.uzh.ch> parents: 14138 diff changeset	1906 %!assert (! is_function_handle ({fh}))
3972c4caa60a Add new function is_function_handle (patch #7695) Juan Pablo Carbajal <carbajal@ifi.uzh.ch> parents: 14138 diff changeset	1907 %!assert (! is_function_handle (1))
3972c4caa60a Add new function is_function_handle (patch #7695) Juan Pablo Carbajal <carbajal@ifi.uzh.ch> parents: 14138 diff changeset	1908
14429 eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14175 diff changeset	1909 %!error is_function_handle ()
eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14175 diff changeset	1910 %!error is_function_handle (1, 2)
14175 3972c4caa60a Add new function is_function_handle (patch #7695) Juan Pablo Carbajal <carbajal@ifi.uzh.ch> parents: 14138 diff changeset	1911 */
3972c4caa60a Add new function is_function_handle (patch #7695) Juan Pablo Carbajal <carbajal@ifi.uzh.ch> parents: 14138 diff changeset	1912
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11541 diff changeset	1913 octave_fcn_binder::octave_fcn_binder (const octave_value& f,
10960 409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1914 const octave_value& root,
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11541 diff changeset	1915 const octave_value_list& templ,
12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11541 diff changeset	1916 const std::vector<int>& mask,
10960 409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1917 int exp_nargin)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1918 : octave_fcn_handle (f), root_handle (root), arg_template (templ),
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1919 arg_mask (mask), expected_nargin (exp_nargin)
22417 48c00363dc74 maint: Use '{ }' for empty function bodies in C++. Rik <rik@octave.org> parents: 22407 diff changeset	1920 { }
10960 409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1921
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1922 octave_fcn_handle *
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23433 diff changeset	1923 octave_fcn_binder::maybe_binder (const octave_value& f,
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23433 diff changeset	1924 octave::tree_evaluator *tw)
10960 409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1925 {
23457 21baad6b35c4 maint: Use C++11 nullptr rather than 0 or NULL when possible. Rik <rik@octave.org> parents: 23450 diff changeset	1926 octave_fcn_handle *retval = nullptr;
10960 409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1927
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1928 octave_user_function *usr_fcn = f.user_function_value (false);
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23717 diff changeset	1929 octave::tree_parameter_list *param_list = (usr_fcn ? usr_fcn->parameter_list ()
980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23717 diff changeset	1930 : nullptr);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11541 diff changeset	1931
23457 21baad6b35c4 maint: Use C++11 nullptr rather than 0 or NULL when possible. Rik <rik@octave.org> parents: 23450 diff changeset	1932 octave::tree_statement_list *cmd_list = nullptr;
21baad6b35c4 maint: Use C++11 nullptr rather than 0 or NULL when possible. Rik <rik@octave.org> parents: 23450 diff changeset	1933 octave::tree_expression *body_expr = nullptr;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11541 diff changeset	1934
17896 f05f571ff1fa Fix null pointer access in octave_fcn_binder::maybe_binder PrasannaKumar Muralidharan <prasannatsmkumar@gmail.com> parents: 17787 diff changeset	1935 if (usr_fcn)
f05f571ff1fa Fix null pointer access in octave_fcn_binder::maybe_binder PrasannaKumar Muralidharan <prasannatsmkumar@gmail.com> parents: 17787 diff changeset	1936 {
f05f571ff1fa Fix null pointer access in octave_fcn_binder::maybe_binder PrasannaKumar Muralidharan <prasannatsmkumar@gmail.com> parents: 17787 diff changeset	1937 cmd_list = usr_fcn->body ();
f05f571ff1fa Fix null pointer access in octave_fcn_binder::maybe_binder PrasannaKumar Muralidharan <prasannatsmkumar@gmail.com> parents: 17787 diff changeset	1938 if (cmd_list)
f05f571ff1fa Fix null pointer access in octave_fcn_binder::maybe_binder PrasannaKumar Muralidharan <prasannatsmkumar@gmail.com> parents: 17787 diff changeset	1939 {
f05f571ff1fa Fix null pointer access in octave_fcn_binder::maybe_binder PrasannaKumar Muralidharan <prasannatsmkumar@gmail.com> parents: 17787 diff changeset	1940 // Verify that body is a single expression (always true in theory).
f05f571ff1fa Fix null pointer access in octave_fcn_binder::maybe_binder PrasannaKumar Muralidharan <prasannatsmkumar@gmail.com> parents: 17787 diff changeset	1941 body_expr = (cmd_list->length () == 1
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23717 diff changeset	1942 ? cmd_list->front ()->expression () : nullptr);
17896 f05f571ff1fa Fix null pointer access in octave_fcn_binder::maybe_binder PrasannaKumar Muralidharan <prasannatsmkumar@gmail.com> parents: 17787 diff changeset	1943 }
f05f571ff1fa Fix null pointer access in octave_fcn_binder::maybe_binder PrasannaKumar Muralidharan <prasannatsmkumar@gmail.com> parents: 17787 diff changeset	1944 }
10960 409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1945
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11541 diff changeset	1946 if (body_expr && body_expr->is_index_expression ()
10960 409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1947 && ! (param_list && param_list->takes_varargs ()))
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1948 {
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1949 // It's an index expression.
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	1950 octave::tree_index_expression idx_expr = dynamic_cast<octave::tree_index_expression >
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1951 (body_expr);
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	1952 octave::tree_expression *head_expr = idx_expr->expression ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	1953 std::list<octave::tree_argument_list *> arg_lists = idx_expr->arg_lists ();
10960 409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1954 std::string type_tags = idx_expr->type_tags ();
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1955
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1956 if (type_tags.length () == 1 && type_tags[0] == '('
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1957 && head_expr->is_identifier ())
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1958 {
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1959 assert (arg_lists.size () == 1);
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1960
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1961 // It's a single index expression: a(x,y,....)
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	1962 octave::tree_identifier *head_id =
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	1963 dynamic_cast<octave::tree_identifier *> (head_expr);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	1964 octave::tree_argument_list *arg_list = arg_lists.front ();
10960 409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1965
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1966 // Build a map of input params to their position.
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1967 std::map<std::string, int> arginmap;
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1968 int npar = 0;
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1969
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1970 if (param_list)
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1971 {
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22755 diff changeset	1972 for (auto& param_p : *param_list)
10960 409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1973 {
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	1974 octave::tree_decl_elt *elt = param_p;
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23717 diff changeset	1975 octave::tree_identifier *id = (elt ? elt->ident () : nullptr);
10960 409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1976 if (id && ! id->is_black_hole ())
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1977 arginmap[id->name ()] = npar;
10960 409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1978 }
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1979 }
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1980
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1981 if (arg_list && arg_list->length () > 0)
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1982 {
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1983 bool bad = false;
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1984 int nargs = arg_list->length ();
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1985 octave_value_list arg_template (nargs);
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1986 std::vector<int> arg_mask (nargs);
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1987
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1988 // Verify that each argument is either a named param, a constant,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1989 // or a defined identifier.
10960 409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1990 int iarg = 0;
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	1991 for (octave::tree_argument_list::iterator it = arg_list->begin ();
10960 409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1992 it != arg_list->end (); ++it, ++iarg)
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1993 {
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	1994 octave::tree_expression elt = it;
10960 409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1995 if (elt && elt->is_constant ())
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1996 {
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23433 diff changeset	1997 arg_template(iarg) = tw->evaluate (elt);
10960 409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1998 arg_mask[iarg] = -1;
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1999 }
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	2000 else if (elt && elt->is_identifier ())
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	2001 {
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2002 octave::tree_identifier *elt_id =
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2003 dynamic_cast<octave::tree_identifier *> (elt);
10960 409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	2004 if (arginmap.find (elt_id->name ()) != arginmap.end ())
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	2005 {
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	2006 arg_mask[iarg] = arginmap[elt_id->name ()];
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	2007 }
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	2008 else if (elt_id->is_defined ())
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	2009 {
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23433 diff changeset	2010 arg_template(iarg) = tw->evaluate (elt_id);
10960 409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	2011 arg_mask[iarg] = -1;
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	2012 }
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	2013 else
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	2014 {
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	2015 bad = true;
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	2016 break;
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	2017 }
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	2018 }
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	2019 else
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	2020 {
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	2021 bad = true;
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	2022 break;
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	2023 }
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	2024 }
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	2025
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	2026 octave_value root_val;
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	2027
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	2028 if (! bad)
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	2029 {
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	2030 // If the head is a value, use it as root.
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	2031 if (head_id->is_defined ())
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23433 diff changeset	2032 root_val = tw->evaluate (head_id);
10960 409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	2033 else
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	2034 {
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	2035 // It's a name.
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	2036 std::string head_name = head_id->name ();
20605 f9c991dc5c1a avoid scope error in anonymous functions (bug #45835) John W. Eaton <jwe@octave.org> parents: 20580 diff changeset	2037
f9c991dc5c1a avoid scope error in anonymous functions (bug #45835) John W. Eaton <jwe@octave.org> parents: 20580 diff changeset	2038 if (head_name == "eval" \|\| head_name == "feval")
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2039 bad = true;
10960 409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	2040 else
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	2041 {
22653 e7a9dfb8bf16 remove obsolete function __dispatch__ John W. Eaton <jwe@octave.org> parents: 22489 diff changeset	2042 // Simulate try/catch.
e7a9dfb8bf16 remove obsolete function __dispatch__ John W. Eaton <jwe@octave.org> parents: 22489 diff changeset	2043 octave::unwind_protect frame;
e7a9dfb8bf16 remove obsolete function __dispatch__ John W. Eaton <jwe@octave.org> parents: 22489 diff changeset	2044 interpreter_try (frame);
10960 409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	2045
22653 e7a9dfb8bf16 remove obsolete function __dispatch__ John W. Eaton <jwe@octave.org> parents: 22489 diff changeset	2046 try
20535 b70cc4bd8109 begin removal of global error_state variable John W. Eaton <jwe@octave.org> parents: 20531 diff changeset	2047 {
22653 e7a9dfb8bf16 remove obsolete function __dispatch__ John W. Eaton <jwe@octave.org> parents: 22489 diff changeset	2048 root_val = make_fcn_handle (head_name);
e7a9dfb8bf16 remove obsolete function __dispatch__ John W. Eaton <jwe@octave.org> parents: 22489 diff changeset	2049 }
e7a9dfb8bf16 remove obsolete function __dispatch__ John W. Eaton <jwe@octave.org> parents: 22489 diff changeset	2050 catch (const octave::execution_exception&)
e7a9dfb8bf16 remove obsolete function __dispatch__ John W. Eaton <jwe@octave.org> parents: 22489 diff changeset	2051 {
23110 af48d8be62b3 move recover_from_exception and atexit functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 23084 diff changeset	2052 octave::interpreter::recover_from_exception ();
10960 409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	2053
22653 e7a9dfb8bf16 remove obsolete function __dispatch__ John W. Eaton <jwe@octave.org> parents: 22489 diff changeset	2054 bad = true;
20535 b70cc4bd8109 begin removal of global error_state variable John W. Eaton <jwe@octave.org> parents: 20531 diff changeset	2055 }
10960 409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	2056 }
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	2057 }
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	2058 }
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	2059
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	2060 if (! bad)
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	2061 {
10961 2cc9b08bfd39 fixes in binders code Jaroslav Hajek <highegg@gmail.com> parents: 10960 diff changeset	2062 // Stash proper name tags.
2cc9b08bfd39 fixes in binders code Jaroslav Hajek <highegg@gmail.com> parents: 10960 diff changeset	2063 std::list<string_vector> arg_names = idx_expr->arg_names ();
2cc9b08bfd39 fixes in binders code Jaroslav Hajek <highegg@gmail.com> parents: 10960 diff changeset	2064 assert (arg_names.size () == 1);
2cc9b08bfd39 fixes in binders code Jaroslav Hajek <highegg@gmail.com> parents: 10960 diff changeset	2065 arg_template.stash_name_tags (arg_names.front ());
2cc9b08bfd39 fixes in binders code Jaroslav Hajek <highegg@gmail.com> parents: 10960 diff changeset	2066
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11541 diff changeset	2067 retval = new octave_fcn_binder (f, root_val, arg_template,
10960 409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	2068 arg_mask, npar);
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	2069 }
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	2070 }
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	2071 }
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	2072 }
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	2073
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	2074 if (! retval)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2075 retval = new octave_fcn_handle (f, octave_fcn_handle::anonymous);
10960 409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	2076
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	2077 return retval;
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	2078 }
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	2079
20605 f9c991dc5c1a avoid scope error in anonymous functions (bug #45835) John W. Eaton <jwe@octave.org> parents: 20580 diff changeset	2080 /*
f9c991dc5c1a avoid scope error in anonymous functions (bug #45835) John W. Eaton <jwe@octave.org> parents: 20580 diff changeset	2081 %!test
f9c991dc5c1a avoid scope error in anonymous functions (bug #45835) John W. Eaton <jwe@octave.org> parents: 20580 diff changeset	2082 %! f = @(t) eval ('2*t');
f9c991dc5c1a avoid scope error in anonymous functions (bug #45835) John W. Eaton <jwe@octave.org> parents: 20580 diff changeset	2083 %! assert (f (21), 42);
f9c991dc5c1a avoid scope error in anonymous functions (bug #45835) John W. Eaton <jwe@octave.org> parents: 20580 diff changeset	2084 */
f9c991dc5c1a avoid scope error in anonymous functions (bug #45835) John W. Eaton <jwe@octave.org> parents: 20580 diff changeset	2085
10960 409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	2086 octave_value_list
23502 c6714ae1c06c eliminate remaining do_multi_index_op methods John W. Eaton <jwe@octave.org> parents: 23501 diff changeset	2087 octave_fcn_binder::call (int nargout, const octave_value_list& args)
10960 409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	2088 {
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	2089 octave_value_list retval;
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	2090
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	2091 if (args.length () == expected_nargin)
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	2092 {
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	2093 for (int i = 0; i < arg_template.length (); i++)
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	2094 {
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	2095 int j = arg_mask[i];
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	2096 if (j >= 0)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2097 arg_template(i) = args(j); // May force a copy...
10960 409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	2098 }
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	2099
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2100 // Make a shallow copy of arg_template, to ensure consistency throughout
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2101 // the following call even if we happen to get back here.
10961 2cc9b08bfd39 fixes in binders code Jaroslav Hajek <highegg@gmail.com> parents: 10960 diff changeset	2102 octave_value_list tmp (arg_template);
23501 1ee4b394a687 use feval instead of do_multi_index_op John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	2103 retval = octave::feval (root_handle, tmp, nargout);
10960 409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	2104 }
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	2105 else
23502 c6714ae1c06c eliminate remaining do_multi_index_op methods John W. Eaton <jwe@octave.org> parents: 23501 diff changeset	2106 retval = octave_fcn_handle::call (nargout, args);
10960 409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	2107
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	2108 return retval;
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	2109 }
13696 d6118a2c0644 fix indexing bug for matrices inside anonymous functions John W. Eaton <jwe@octave.org> parents: 13193 diff changeset	2110
d6118a2c0644 fix indexing bug for matrices inside anonymous functions John W. Eaton <jwe@octave.org> parents: 13193 diff changeset	2111 /*
14085 4e8f23ccadce test: Use internal prefix "__" for %!functions to avoid polluting workspace Rik <octave@nomad.inbox5.com> parents: 13696 diff changeset	2112 %!function r = __f (g, i)
13696 d6118a2c0644 fix indexing bug for matrices inside anonymous functions John W. Eaton <jwe@octave.org> parents: 13193 diff changeset	2113 %! r = g(i);
d6118a2c0644 fix indexing bug for matrices inside anonymous functions John W. Eaton <jwe@octave.org> parents: 13193 diff changeset	2114 %!endfunction
d6118a2c0644 fix indexing bug for matrices inside anonymous functions John W. Eaton <jwe@octave.org> parents: 13193 diff changeset	2115 %!test
d6118a2c0644 fix indexing bug for matrices inside anonymous functions John W. Eaton <jwe@octave.org> parents: 13193 diff changeset	2116 %! x = [1,2;3,4];
14085 4e8f23ccadce test: Use internal prefix "__" for %!functions to avoid polluting workspace Rik <octave@nomad.inbox5.com> parents: 13696 diff changeset	2117 %! assert (__f (@(i) x(:,i), 1), [1;3]);
13696 d6118a2c0644 fix indexing bug for matrices inside anonymous functions John W. Eaton <jwe@octave.org> parents: 13193 diff changeset	2118 */

Mercurial > octave

annotate libinterp/octave-value/ov-fcn-handle.cc @ 24108:1a53f0c855db