octave-nkf: src/ov-fcn-handle.cc annotate

annotate src/ov-fcn-handle.cc @ 14085:4e8f23ccadce stable

test: Use internal prefix "__" for %!functions to avoid polluting workspace symbol table until bug #34497 has been resolved. * cellfun.cc, dassl.cc, lsode.cc, qr.cc, quad.cc, data.cc, ov-fcn-handle.cc, pt-fcn-handle.cc: Use internal prefix "__" for %!functions to avoid polluting workspace symbol table until bug #34497 has been resolved.

author	Rik <octave@nomad.inbox5.com>
date	Wed, 21 Dec 2011 09:44:46 -0800
parents	d6118a2c0644
children	72c96de7a403

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
11523 fd0a3ac60b0e update copyright notices John W. Eaton <jwe@octave.org> parents: 11461 diff changeset	3 Copyright (C) 2003-2011 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
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	10 under the terms of the GNU General Public License as published by the
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6974 diff changeset	11 Free Software Foundation; either version 3 of the License, or (at your
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6974 diff changeset	12 option) any later version.
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	13
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	14 Octave is distributed in the hope that it will be useful, but WITHOUT
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	15 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	16 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	17 for more details.
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
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	25 #ifdef HAVE_CONFIG_H
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	26 #include <config.h>
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>
5765 7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5760 diff changeset	30 #include <sstream>
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: 5105 diff changeset	31 #include <vector>
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	32
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	33 #include "file-ops.h"
8377 25bc2d31e1bf improve OCTAVE_LOCAL_BUFFER Jaroslav Hajek <highegg@gmail.com> parents: 8021 diff changeset	34 #include "oct-locbuf.h"
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	35
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	36 #include "defun.h"
4654 a9b22513b7a6 [project @ 2003-11-24 18:56:35 by jwe] jwe parents: 4649 diff changeset	37 #include "error.h"
a9b22513b7a6 [project @ 2003-11-24 18:56:35 by jwe] jwe parents: 4649 diff changeset	38 #include "gripes.h"
5663 775e065f7dc4 [project @ 2006-03-13 21:30:06 by jwe] jwe parents: 5313 diff changeset	39 #include "input.h"
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	40 #include "oct-map.h"
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	41 #include "ov-base.h"
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	42 #include "ov-fcn-handle.h"
4980 003bbf6c13d8 [project @ 2004-09-09 15:47:17 by jwe] jwe parents: 4978 diff changeset	43 #include "ov-usr-fcn.h"
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	44 #include "pr-output.h"
4980 003bbf6c13d8 [project @ 2004-09-09 15:47:17 by jwe] jwe parents: 4978 diff changeset	45 #include "pt-pr-code.h"
003bbf6c13d8 [project @ 2004-09-09 15:47:17 by jwe] jwe parents: 4978 diff changeset	46 #include "pt-misc.h"
003bbf6c13d8 [project @ 2004-09-09 15:47:17 by jwe] jwe parents: 4978 diff changeset	47 #include "pt-stmt.h"
003bbf6c13d8 [project @ 2004-09-09 15:47:17 by jwe] jwe parents: 4978 diff changeset	48 #include "pt-cmd.h"
003bbf6c13d8 [project @ 2004-09-09 15:47:17 by jwe] jwe parents: 4978 diff changeset	49 #include "pt-exp.h"
003bbf6c13d8 [project @ 2004-09-09 15:47:17 by jwe] jwe parents: 4978 diff changeset	50 #include "pt-assign.h"
10960 409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	51 #include "pt-arg-list.h"
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	52 #include "variables.h"
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	53 #include "parse.h"
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	54 #include "unwind-prot.h"
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	55 #include "defaults.h"
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	56 #include "file-stat.h"
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	57 #include "load-path.h"
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	58 #include "oct-env.h"
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	59
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	60 #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	61 #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	62 #include "ls-hdf5.h"
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	63 #include "ls-oct-ascii.h"
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	64 #include "ls-oct-binary.h"
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	65 #include "ls-utils.h"
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	66
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	67 DEFINE_OCTAVE_ALLOCATOR (octave_fcn_handle);
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	68
4612 d44675070f1a [project @ 2003-11-14 19:49:56 by jwe] jwe parents: 4346 diff changeset	69 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	70 "function handle",
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	71 "function_handle");
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	72
10261 a4fb4675accb make printing of handles more Matlab-compatible Jaroslav Hajek <highegg@gmail.com> parents: 10250 diff changeset	73 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	74
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7756 diff changeset	75 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	76 const std::string& n)
10321 97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	77 : fcn (f), nm (n), has_overloads (false)
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7756 diff changeset	78 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7756 diff changeset	79 octave_user_function *uf = fcn.user_function_value (true);
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7756 diff changeset	80
10261 a4fb4675accb make printing of handles more Matlab-compatible Jaroslav Hajek <highegg@gmail.com> parents: 10250 diff changeset	81 if (uf && nm != anonymous)
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7756 diff changeset	82 symbol_table::cache_name (uf->scope (), nm);
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7756 diff changeset	83 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7756 diff changeset	84
4924 9a3a32f5a27d [project @ 2004-08-02 19:04:20 by jwe] jwe parents: 4675 diff changeset	85 octave_value_list
9a3a32f5a27d [project @ 2004-08-02 19:04:20 by jwe] jwe parents: 4675 diff changeset	86 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	87 const std::list<octave_value_list>& idx,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	88 int nargout)
4924 9a3a32f5a27d [project @ 2004-08-02 19:04:20 by jwe] jwe parents: 4675 diff changeset	89 {
10849 f1a45913662a propagate isargout info through function handles Jaroslav Hajek <highegg@gmail.com> parents: 10840 diff changeset	90 return octave_fcn_handle::subsref (type, idx, nargout, 0);
f1a45913662a propagate isargout info through function handles Jaroslav Hajek <highegg@gmail.com> parents: 10840 diff changeset	91 }
f1a45913662a propagate isargout info through function handles Jaroslav Hajek <highegg@gmail.com> parents: 10840 diff changeset	92
f1a45913662a propagate isargout info through function handles Jaroslav Hajek <highegg@gmail.com> parents: 10840 diff changeset	93 octave_value_list
f1a45913662a propagate isargout info through function handles Jaroslav Hajek <highegg@gmail.com> parents: 10840 diff changeset	94 octave_fcn_handle::subsref (const std::string& type,
f1a45913662a propagate isargout info through function handles Jaroslav Hajek <highegg@gmail.com> parents: 10840 diff changeset	95 const std::list<octave_value_list>& idx,
f1a45913662a propagate isargout info through function handles Jaroslav Hajek <highegg@gmail.com> parents: 10840 diff changeset	96 int nargout, const std::list<octave_lvalue>* lvalue_list)
f1a45913662a propagate isargout info through function handles Jaroslav Hajek <highegg@gmail.com> parents: 10840 diff changeset	97 {
4924 9a3a32f5a27d [project @ 2004-08-02 19:04:20 by jwe] jwe parents: 4675 diff changeset	98 octave_value_list retval;
9a3a32f5a27d [project @ 2004-08-02 19:04:20 by jwe] jwe parents: 4675 diff changeset	99
9a3a32f5a27d [project @ 2004-08-02 19:04:20 by jwe] jwe parents: 4675 diff changeset	100 switch (type[0])
9a3a32f5a27d [project @ 2004-08-02 19:04:20 by jwe] jwe parents: 4675 diff changeset	101 {
9a3a32f5a27d [project @ 2004-08-02 19:04:20 by jwe] jwe parents: 4675 diff changeset	102 case '(':
9a3a32f5a27d [project @ 2004-08-02 19:04:20 by jwe] jwe parents: 4675 diff changeset	103 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	104 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	105
10849 f1a45913662a propagate isargout info through function handles Jaroslav Hajek <highegg@gmail.com> parents: 10840 diff changeset	106 retval = do_multi_index_op (tmp_nargout, idx.front (),
f1a45913662a propagate isargout info through function handles Jaroslav Hajek <highegg@gmail.com> parents: 10840 diff changeset	107 idx.size () == 1 ? lvalue_list : 0);
4924 9a3a32f5a27d [project @ 2004-08-02 19:04:20 by jwe] jwe parents: 4675 diff changeset	108 }
9a3a32f5a27d [project @ 2004-08-02 19:04:20 by jwe] jwe parents: 4675 diff changeset	109 break;
9a3a32f5a27d [project @ 2004-08-02 19:04:20 by jwe] jwe parents: 4675 diff changeset	110
9a3a32f5a27d [project @ 2004-08-02 19:04:20 by jwe] jwe parents: 4675 diff changeset	111 case '{':
9a3a32f5a27d [project @ 2004-08-02 19:04:20 by jwe] jwe parents: 4675 diff changeset	112 case '.':
9a3a32f5a27d [project @ 2004-08-02 19:04:20 by jwe] jwe parents: 4675 diff changeset	113 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	114 std::string tnm = type_name ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	115 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	116 }
9a3a32f5a27d [project @ 2004-08-02 19:04:20 by jwe] jwe parents: 4675 diff changeset	117 break;
9a3a32f5a27d [project @ 2004-08-02 19:04:20 by jwe] jwe parents: 4675 diff changeset	118
9a3a32f5a27d [project @ 2004-08-02 19:04:20 by jwe] jwe parents: 4675 diff changeset	119 default:
9a3a32f5a27d [project @ 2004-08-02 19:04:20 by jwe] jwe parents: 4675 diff changeset	120 panic_impossible ();
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
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9419 diff changeset	123 // FIXME -- perhaps there should be an
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9419 diff changeset	124 // octave_value_list::next_subsref member function? See also
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9419 diff changeset	125 // octave_builtin::subsref.
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9419 diff changeset	126
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9419 diff changeset	127 if (idx.size () > 1)
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9419 diff changeset	128 retval = retval(0).next_subsref (nargout, type, idx);
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9419 diff changeset	129
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9419 diff changeset	130 return retval;
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
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9419 diff changeset	133 octave_value_list
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11541 diff changeset	134 octave_fcn_handle::do_multi_index_op (int nargout,
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9419 diff changeset	135 const octave_value_list& args)
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9419 diff changeset	136 {
10849 f1a45913662a propagate isargout info through function handles Jaroslav Hajek <highegg@gmail.com> parents: 10840 diff changeset	137 return do_multi_index_op (nargout, args, 0);
f1a45913662a propagate isargout info through function handles Jaroslav Hajek <highegg@gmail.com> parents: 10840 diff changeset	138 }
f1a45913662a propagate isargout info through function handles Jaroslav Hajek <highegg@gmail.com> parents: 10840 diff changeset	139
f1a45913662a propagate isargout info through function handles Jaroslav Hajek <highegg@gmail.com> parents: 10840 diff changeset	140 octave_value_list
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11541 diff changeset	141 octave_fcn_handle::do_multi_index_op (int nargout,
10849 f1a45913662a propagate isargout info through function handles Jaroslav Hajek <highegg@gmail.com> parents: 10840 diff changeset	142 const octave_value_list& args,
f1a45913662a propagate isargout info through function handles Jaroslav Hajek <highegg@gmail.com> parents: 10840 diff changeset	143 const std::list<octave_lvalue>* lvalue_list)
f1a45913662a propagate isargout info through function handles Jaroslav Hajek <highegg@gmail.com> parents: 10840 diff changeset	144 {
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9419 diff changeset	145 octave_value_list retval;
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9419 diff changeset	146
10321 97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	147 out_of_date_check (fcn, std::string (), false);
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9419 diff changeset	148
10321 97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	149 if (has_overloads)
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9419 diff changeset	150 {
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9419 diff changeset	151 // Possibly overloaded function.
10321 97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	152 octave_value ov_fcn;
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 // Compute dispatch type.
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	155 builtin_type_t btyp;
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	156 std::string dispatch_type = get_dispatch_type (args, btyp);
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9419 diff changeset	157
10321 97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	158 // Retrieve overload.
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	159 if (btyp != btyp_unknown)
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9419 diff changeset	160 {
10321 97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	161 out_of_date_check (builtin_overloads[btyp], dispatch_type, false);
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	162 ov_fcn = builtin_overloads[btyp];
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	163 }
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	164 else
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	165 {
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	166 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	167
a00ff5cedb9b also look to parent classes for overloaded functions called through handles John W. Eaton <jwe@octave.org> parents: 12714 diff changeset	168 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	169 {
a00ff5cedb9b also look to parent classes for overloaded functions called through handles John W. Eaton <jwe@octave.org> parents: 12714 diff changeset	170 // 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	171
a00ff5cedb9b also look to parent classes for overloaded functions called through handles John W. Eaton <jwe@octave.org> parents: 12714 diff changeset	172 std::list<std::string> plist
a00ff5cedb9b also look to parent classes for overloaded functions called through handles John W. Eaton <jwe@octave.org> parents: 12714 diff changeset	173 = symbol_table::parent_classes (dispatch_type);
a00ff5cedb9b also look to parent classes for overloaded functions called through handles John W. Eaton <jwe@octave.org> parents: 12714 diff changeset	174
a00ff5cedb9b also look to parent classes for overloaded functions called through handles John W. Eaton <jwe@octave.org> parents: 12714 diff changeset	175 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	176
a00ff5cedb9b also look to parent classes for overloaded functions called through handles John W. Eaton <jwe@octave.org> parents: 12714 diff changeset	177 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	178 {
a00ff5cedb9b also look to parent classes for overloaded functions called through handles John W. Eaton <jwe@octave.org> parents: 12714 diff changeset	179 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	180
a00ff5cedb9b also look to parent classes for overloaded functions called through handles John W. Eaton <jwe@octave.org> parents: 12714 diff changeset	181 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	182
a00ff5cedb9b also look to parent classes for overloaded functions called through handles John W. Eaton <jwe@octave.org> parents: 12714 diff changeset	183 octave_value ftmp = symbol_table::find_method (fnm, pname);
a00ff5cedb9b also look to parent classes for overloaded functions called through handles John W. Eaton <jwe@octave.org> parents: 12714 diff changeset	184
a00ff5cedb9b also look to parent classes for overloaded functions called through handles John W. Eaton <jwe@octave.org> parents: 12714 diff changeset	185 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	186 {
a00ff5cedb9b also look to parent classes for overloaded functions called through handles John W. Eaton <jwe@octave.org> parents: 12714 diff changeset	187 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	188
a00ff5cedb9b also look to parent classes for overloaded functions called through handles John W. Eaton <jwe@octave.org> parents: 12714 diff changeset	189 out_of_date_check (ftmp, pname, false);
a00ff5cedb9b also look to parent classes for overloaded functions called through handles John W. Eaton <jwe@octave.org> parents: 12714 diff changeset	190 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	191
a00ff5cedb9b also look to parent classes for overloaded functions called through handles John W. Eaton <jwe@octave.org> parents: 12714 diff changeset	192 break;
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
a00ff5cedb9b also look to parent classes for overloaded functions called through handles John W. Eaton <jwe@octave.org> parents: 12714 diff changeset	195 pit++;
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 }
a00ff5cedb9b also look to parent classes for overloaded functions called through handles John W. Eaton <jwe@octave.org> parents: 12714 diff changeset	198 else
9466 2ebd0717c12d also cache class dispatch lookups in function handles Jaroslav Hajek <highegg@gmail.com> parents: 9463 diff changeset	199 {
10321 97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	200 out_of_date_check (it->second, dispatch_type, false);
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	201 ov_fcn = it->second;
9466 2ebd0717c12d also cache class dispatch lookups in function handles Jaroslav Hajek <highegg@gmail.com> parents: 9463 diff changeset	202 }
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9419 diff changeset	203 }
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9419 diff changeset	204
10321 97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	205 if (ov_fcn.is_defined ())
10849 f1a45913662a propagate isargout info through function handles Jaroslav Hajek <highegg@gmail.com> parents: 10840 diff changeset	206 retval = ov_fcn.do_multi_index_op (nargout, args, lvalue_list);
10321 97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	207 else if (fcn.is_defined ())
10849 f1a45913662a propagate isargout info through function handles Jaroslav Hajek <highegg@gmail.com> parents: 10840 diff changeset	208 retval = fcn.do_multi_index_op (nargout, args, lvalue_list);
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9419 diff changeset	209 else
10321 97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	210 error ("%s: no method for class %s", 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 ())
10849 f1a45913662a propagate isargout info through function handles Jaroslav Hajek <highegg@gmail.com> parents: 10840 diff changeset	216 retval = fcn.do_multi_index_op (nargout, args, lvalue_list);
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
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11541 diff changeset	224 bool
10322 21551cc88061 improve function handles comparison Jaroslav Hajek <highegg@gmail.com> parents: 10321 diff changeset	225 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	226 {
21551cc88061 improve function handles comparison Jaroslav Hajek <highegg@gmail.com> parents: 10321 diff changeset	227 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	228 retval = retval && (overloads.size () == h.overloads.size ());
21551cc88061 improve function handles comparison Jaroslav Hajek <highegg@gmail.com> parents: 10321 diff changeset	229
21551cc88061 improve function handles comparison Jaroslav Hajek <highegg@gmail.com> parents: 10321 diff changeset	230 if (retval && has_overloads)
21551cc88061 improve function handles comparison Jaroslav Hajek <highegg@gmail.com> parents: 10321 diff changeset	231 {
21551cc88061 improve function handles comparison Jaroslav Hajek <highegg@gmail.com> parents: 10321 diff changeset	232 for (int i = 0; i < btyp_num_types && retval; i++)
21551cc88061 improve function handles comparison Jaroslav Hajek <highegg@gmail.com> parents: 10321 diff changeset	233 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	234
21551cc88061 improve function handles comparison Jaroslav Hajek <highegg@gmail.com> parents: 10321 diff changeset	235 str_ov_map::const_iterator iter = overloads.begin (), hiter = h.overloads.begin ();
21551cc88061 improve function handles comparison Jaroslav Hajek <highegg@gmail.com> parents: 10321 diff changeset	236 for (; iter != overloads.end () && retval; iter++, hiter++)
21551cc88061 improve function handles comparison Jaroslav Hajek <highegg@gmail.com> parents: 10321 diff changeset	237 retval = (iter->first == hiter->first) && (iter->second.is_copy_of (hiter->second));
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
21551cc88061 improve function handles comparison Jaroslav Hajek <highegg@gmail.com> parents: 10321 diff changeset	240 return retval;
21551cc88061 improve function handles comparison Jaroslav Hajek <highegg@gmail.com> parents: 10321 diff changeset	241 }
21551cc88061 improve function handles comparison Jaroslav Hajek <highegg@gmail.com> parents: 10321 diff changeset	242
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	243 bool
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11541 diff changeset	244 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	245 const std::string& fpath)
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	246 {
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	247 bool success = true;
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	248
7745 0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7744 diff changeset	249 if (octaveroot.length () != 0
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7744 diff changeset	250 && fpath.length () >= octaveroot.length ()
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7744 diff changeset	251 && fpath.substr (0, octaveroot.length ()) == octaveroot
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7744 diff changeset	252 && OCTAVE_EXEC_PREFIX != octaveroot)
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	253 {
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	254 // First check if just replacing matlabroot is enough
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11541 diff changeset	255 std::string str = OCTAVE_EXEC_PREFIX +
12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11541 diff changeset	256 fpath.substr (octaveroot.length ());
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	257 file_stat fs (str);
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	258
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	259 if (fs.exists ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	260 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	261 size_t xpos = str.find_last_of (file_ops::dir_sep_chars ());
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	262
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	263 std::string dir_name = str.substr (0, xpos);
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	264
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	265 octave_function *xfcn
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	266 = load_fcn_from_file (str, dir_name, "", nm);
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	267
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	268 if (xfcn)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	269 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	270 octave_value tmp (xfcn);
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	271
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	272 fcn = octave_value (new octave_fcn_handle (tmp, nm));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	273 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	274 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	275 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	276 error ("function handle points to non-existent function");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	277 success = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	278 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	279 }
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	280 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	281 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	282 // Next just search for it anywhere in the system path
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	283 string_vector names(3);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	284 names(0) = nm + ".oct";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	285 names(1) = nm + ".mex";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	286 names(2) = nm + ".m";
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	287
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	288 dir_path p (load_path::system_path ());
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	289
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	290 str = octave_env::make_absolute (p.find_first_of (names));
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	291
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	292 size_t xpos = str.find_last_of (file_ops::dir_sep_chars ());
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	293
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	294 std::string dir_name = str.substr (0, xpos);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	295
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	296 octave_function *xfcn = load_fcn_from_file (str, dir_name, "", nm);
4989 19b73a80e1d9 [project @ 2004-09-11 13:31:43 by jwe] jwe parents: 4988 diff changeset	297
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	298 if (xfcn)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	299 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	300 octave_value tmp (xfcn);
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	301
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	302 fcn = octave_value (new octave_fcn_handle (tmp, nm));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	303 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	304 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	305 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	306 error ("function handle points to non-existent function");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	307 success = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	308 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	309 }
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	310 }
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	311 else
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	312 {
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	313 if (fpath.length () > 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	314 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	315 size_t xpos = fpath.find_last_of (file_ops::dir_sep_chars ());
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	316
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	317 std::string dir_name = fpath.substr (0, xpos);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	318
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	319 octave_function *xfcn = load_fcn_from_file (fpath, dir_name, "", nm);
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	320
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	321 if (xfcn)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	322 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	323 octave_value tmp (xfcn);
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	324
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	325 fcn = octave_value (new octave_fcn_handle (tmp, nm));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	326 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	327 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	328 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	329 error ("function handle points to non-existent function");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	330 success = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	331 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	332 }
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	333 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	334 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	335 fcn = symbol_table::find_function (nm);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	336
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	337 if (! fcn.is_function ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	338 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	339 error ("function handle points to non-existent function");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	340 success = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	341 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	342 }
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	343 }
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	344
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	345 return success;
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	346 }
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	347
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	348 bool
6974 9e32bb109980 [project @ 2007-10-08 11:06:47 by jwe] jwe parents: 6695 diff changeset	349 octave_fcn_handle::save_ascii (std::ostream& os)
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	350 {
10261 a4fb4675accb make printing of handles more Matlab-compatible Jaroslav Hajek <highegg@gmail.com> parents: 10250 diff changeset	351 if (nm == anonymous)
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	352 {
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	353 os << nm << "\n";
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	354
4989 19b73a80e1d9 [project @ 2004-09-11 13:31:43 by jwe] jwe parents: 4988 diff changeset	355 print_raw (os, true);
19b73a80e1d9 [project @ 2004-09-11 13:31:43 by jwe] jwe parents: 4988 diff changeset	356 os << "\n";
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	357
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	358 if (fcn.is_undefined ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	359 return false;
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 octave_user_function *f = fcn.user_function_value ();
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	362
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	363 std::list<symbol_table::symbol_record> vars
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	364 = symbol_table::all_variables (f->scope (), 0);
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	365
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	366 size_t varlen = vars.size ();
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	367
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	368 if (varlen > 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	369 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	370 os << "# length: " << varlen << "\n";
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	371
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	372 for (std::list<symbol_table::symbol_record>::const_iterator p = vars.begin ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	373 p != vars.end (); p++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	374 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	375 if (! save_ascii_data (os, p->varval (), p->name (), false, 0))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	376 return os;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	377 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	378 }
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	379 }
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	380 else
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	381 {
7744 14b841c47a5f handle load/save for handles to built-in functions John W. Eaton <jwe@octave.org> parents: 7740 diff changeset	382 octave_function *f = function_value ();
14b841c47a5f handle load/save for handles to built-in functions John W. Eaton <jwe@octave.org> parents: 7740 diff changeset	383 std::string fnm = f ? f->fcn_file_name () : std::string ();
14b841c47a5f handle load/save for handles to built-in functions John W. Eaton <jwe@octave.org> parents: 7740 diff changeset	384
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	385 os << "# octaveroot: " << OCTAVE_EXEC_PREFIX << "\n";
7744 14b841c47a5f handle load/save for handles to built-in functions John W. Eaton <jwe@octave.org> parents: 7740 diff changeset	386 if (! fnm.empty ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	387 os << "# path: " << fnm << "\n";
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	388 os << nm << "\n";
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	389 }
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	390
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	391 return true;
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	392 }
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	393
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	394 bool
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	395 octave_fcn_handle::load_ascii (std::istream& is)
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	396 {
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	397 bool success = true;
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	398
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	399 std::streampos pos = is.tellg ();
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	400 std::string octaveroot = extract_keyword (is, "octaveroot", true);
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	401 if (octaveroot.length() == 0)
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	402 {
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	403 is.seekg (pos);
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	404 is.clear ();
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	405 }
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	406 pos = is.tellg ();
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	407 std::string fpath = extract_keyword (is, "path", true);
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	408 if (fpath.length() == 0)
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	409 {
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	410 is.seekg (pos);
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	411 is.clear ();
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	412 }
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	413
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	414 is >> nm;
4989 19b73a80e1d9 [project @ 2004-09-11 13:31:43 by jwe] jwe parents: 4988 diff changeset	415
10261 a4fb4675accb make printing of handles more Matlab-compatible Jaroslav Hajek <highegg@gmail.com> parents: 10250 diff changeset	416 if (nm == anonymous)
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	417 {
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	418 skip_preceeding_newline (is);
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	419
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	420 std::string buf;
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	421
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	422 if (is)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	423 {
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	424
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	425 // 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	426 // newline in the stream.
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	427 buf = read_until_newline (is, true);
4989 19b73a80e1d9 [project @ 2004-09-11 13:31:43 by jwe] jwe parents: 4988 diff changeset	428
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	429 }
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	430
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	431 pos = is.tellg ();
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	432
10066 2cd940306a06 make unwind_protect frames local Jaroslav Hajek <highegg@gmail.com> parents: 9892 diff changeset	433 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	434
c6463412aebb eliminate symbol_table::scope_stack; fix scoping issue with evalin John W. Eaton <jwe@octave.org> parents: 8946 diff changeset	435 // 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	436 // 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	437
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	438 symbol_table::scope_id local_scope = symbol_table::alloc_scope ();
10066 2cd940306a06 make unwind_protect frames local Jaroslav Hajek <highegg@gmail.com> parents: 9892 diff changeset	439 frame.add_fcn (symbol_table::erase_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	440
c6463412aebb eliminate symbol_table::scope_stack; fix scoping issue with evalin John W. Eaton <jwe@octave.org> parents: 8946 diff changeset	441 symbol_table::set_scope (local_scope);
c6463412aebb eliminate symbol_table::scope_stack; fix scoping issue with evalin John W. Eaton <jwe@octave.org> parents: 8946 diff changeset	442
c6463412aebb eliminate symbol_table::scope_stack; fix scoping issue with evalin John W. Eaton <jwe@octave.org> parents: 8946 diff changeset	443 octave_call_stack::push (local_scope, 0);
10066 2cd940306a06 make unwind_protect frames local Jaroslav Hajek <highegg@gmail.com> parents: 9892 diff changeset	444 frame.add_fcn (octave_call_stack::pop);
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	445
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	446 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	447
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	448 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	449 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	450 if (len > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	451 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	452 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	453 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	454 octave_value t2;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	455 bool dummy;
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	456
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	457 std::string name
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	458 = read_ascii_data (is, std::string (), dummy, t2, i);
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	459
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	460 if (!is)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	461 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	462 error ("load: failed to load anonymous function handle");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	463 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	464 }
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	465
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	466 symbol_table::varref (name, local_scope, 0) = t2;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	467 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	468 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	469 }
4989 19b73a80e1d9 [project @ 2004-09-11 13:31:43 by jwe] jwe parents: 4988 diff changeset	470 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	471 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	472 is.seekg (pos);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	473 is.clear ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	474 }
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	475
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	476 if (is && success)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	477 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	478 int parse_status;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11541 diff changeset	479 octave_value anon_fcn_handle =
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	480 eval_string (buf, true, parse_status);
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	481
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	482 if (parse_status == 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	483 {
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11541 diff changeset	484 octave_fcn_handle *fh =
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	485 anon_fcn_handle.fcn_handle_value ();
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7756 diff changeset	486
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	487 if (fh)
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 fcn = fh->fcn;
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7756 diff changeset	490
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	491 octave_user_function *uf = fcn.user_function_value (true);
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7756 diff changeset	492
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	493 if (uf)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	494 symbol_table::cache_name (uf->scope (), nm);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	495 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	496 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	497 success = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	498 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	499 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	500 success = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	501 }
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	502 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	503 success = false;
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	504 }
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	505 else
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	506 success = set_fcn (octaveroot, fpath);
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	507
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	508 return success;
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	509 }
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	510
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	511 bool
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	512 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	513 {
10261 a4fb4675accb make printing of handles more Matlab-compatible Jaroslav Hajek <highegg@gmail.com> parents: 10250 diff changeset	514 if (nm == anonymous)
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 std::ostringstream nmbuf;
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	517
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	518 if (fcn.is_undefined ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	519 return false;
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	520
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	521 octave_user_function *f = fcn.user_function_value ();
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	522
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	523 std::list<symbol_table::symbol_record> vars
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	524 = symbol_table::all_variables (f->scope (), 0);
6625 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 size_t varlen = vars.size ();
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	527
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	528 if (varlen > 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	529 nmbuf << nm << " " << varlen;
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	530 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	531 nmbuf << nm;
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	532
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	533 std::string buf_str = nmbuf.str();
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	534 int32_t tmp = buf_str.length ();
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	535 os.write (reinterpret_cast<char *> (&tmp), 4);
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	536 os.write (buf_str.c_str (), buf_str.length ());
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	537
5765 7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5760 diff changeset	538 std::ostringstream buf;
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	539 print_raw (buf, true);
5765 7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5760 diff changeset	540 std::string stmp = buf.str ();
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	541 tmp = stmp.length ();
5760 8d7162924bd3 [project @ 2006-04-14 04:01:37 by jwe] jwe parents: 5663 diff changeset	542 os.write (reinterpret_cast<char *> (&tmp), 4);
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	543 os.write (stmp.c_str (), stmp.length ());
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	544
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	545 if (varlen > 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	546 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	547 for (std::list<symbol_table::symbol_record>::const_iterator p = vars.begin ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	548 p != vars.end (); p++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	549 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	550 if (! save_binary_data (os, p->varval (), p->name (),
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	551 "", 0, save_as_floats))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	552 return os;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	553 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	554 }
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	555 }
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	556 else
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	557 {
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	558 std::ostringstream nmbuf;
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	559
7744 14b841c47a5f handle load/save for handles to built-in functions John W. Eaton <jwe@octave.org> parents: 7740 diff changeset	560 octave_function *f = function_value ();
14b841c47a5f handle load/save for handles to built-in functions John W. Eaton <jwe@octave.org> parents: 7740 diff changeset	561 std::string fnm = f ? f->fcn_file_name () : std::string ();
14b841c47a5f handle load/save for handles to built-in functions John W. Eaton <jwe@octave.org> parents: 7740 diff changeset	562
14b841c47a5f handle load/save for handles to built-in functions John W. Eaton <jwe@octave.org> parents: 7740 diff changeset	563 nmbuf << nm << "\n" << OCTAVE_EXEC_PREFIX << "\n" << fnm;
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 std::string buf_str = nmbuf.str ();
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	566 int32_t tmp = buf_str.length ();
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	567 os.write (reinterpret_cast<char *> (&tmp), 4);
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	568 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	569 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	570
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	571 return true;
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	572 }
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	573
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	574 bool
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	575 octave_fcn_handle::load_binary (std::istream& is, bool swap,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	576 oct_mach_info::float_format fmt)
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	577 {
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	578 bool success = true;
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	579
5828 22e23bee74c8 [project @ 2006-05-23 06:05:14 by jwe] jwe parents: 5823 diff changeset	580 int32_t tmp;
5760 8d7162924bd3 [project @ 2006-04-14 04:01:37 by jwe] jwe parents: 5663 diff changeset	581 if (! is.read (reinterpret_cast<char *> (&tmp), 4))
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	582 return false;
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	583 if (swap)
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	584 swap_bytes<4> (&tmp);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	585
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	586 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	587 // 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	588 // 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	589 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	590 ctmp1[tmp] = 0;
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	591 nm = std::string (ctmp1);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	592
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	593 if (! is)
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	594 return false;
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	595
10261 a4fb4675accb make printing of handles more Matlab-compatible Jaroslav Hajek <highegg@gmail.com> parents: 10250 diff changeset	596 size_t anl = anonymous.length ();
a4fb4675accb make printing of handles more Matlab-compatible Jaroslav Hajek <highegg@gmail.com> parents: 10250 diff changeset	597
a4fb4675accb make printing of handles more Matlab-compatible Jaroslav Hajek <highegg@gmail.com> parents: 10250 diff changeset	598 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	599 {
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	600 octave_idx_type len = 0;
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	601
10261 a4fb4675accb make printing of handles more Matlab-compatible Jaroslav Hajek <highegg@gmail.com> parents: 10250 diff changeset	602 if (nm.length() > anl)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	603 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	604 std::istringstream nm_is (nm.substr (anl));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	605 nm_is >> len;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	606 nm = nm.substr (0, anl);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	607 }
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	608
5760 8d7162924bd3 [project @ 2006-04-14 04:01:37 by jwe] jwe parents: 5663 diff changeset	609 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	610 return false;
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	611 if (swap)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	612 swap_bytes<4> (&tmp);
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	613
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	614 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	615 // 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	616 // 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	617 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	618 ctmp2[tmp] = 0;
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	619
10066 2cd940306a06 make unwind_protect frames local Jaroslav Hajek <highegg@gmail.com> parents: 9892 diff changeset	620 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	621
c6463412aebb eliminate symbol_table::scope_stack; fix scoping issue with evalin John W. Eaton <jwe@octave.org> parents: 8946 diff changeset	622 // 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	623 // 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	624
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	625 symbol_table::scope_id local_scope = symbol_table::alloc_scope ();
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11541 diff changeset	626 frame.add_fcn (symbol_table::erase_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	627
c6463412aebb eliminate symbol_table::scope_stack; fix scoping issue with evalin John W. Eaton <jwe@octave.org> parents: 8946 diff changeset	628 symbol_table::set_scope (local_scope);
c6463412aebb eliminate symbol_table::scope_stack; fix scoping issue with evalin John W. Eaton <jwe@octave.org> parents: 8946 diff changeset	629
c6463412aebb eliminate symbol_table::scope_stack; fix scoping issue with evalin John W. Eaton <jwe@octave.org> parents: 8946 diff changeset	630 octave_call_stack::push (local_scope, 0);
10066 2cd940306a06 make unwind_protect frames local Jaroslav Hajek <highegg@gmail.com> parents: 9892 diff changeset	631 frame.add_fcn (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	632
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	633 if (len > 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	634 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	635 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	636 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	637 octave_value t2;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	638 bool dummy;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	639 std::string doc;
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	640
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11541 diff changeset	641 std::string name =
12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11541 diff changeset	642 read_binary_data (is, swap, fmt, std::string (),
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	643 dummy, t2, doc);
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	644
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	645 if (!is)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	646 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	647 error ("load: failed to load anonymous function handle");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	648 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	649 }
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	650
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	651 symbol_table::varref (name, local_scope) = t2;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	652 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	653 }
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	654
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	655 if (is && success)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	656 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	657 int parse_status;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11541 diff changeset	658 octave_value anon_fcn_handle =
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	659 eval_string (ctmp2, true, parse_status);
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	660
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	661 if (parse_status == 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	662 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	663 octave_fcn_handle *fh = anon_fcn_handle.fcn_handle_value ();
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7756 diff changeset	664
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	665 if (fh)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	666 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	667 fcn = fh->fcn;
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7756 diff changeset	668
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	669 octave_user_function *uf = fcn.user_function_value (true);
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7756 diff changeset	670
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	671 if (uf)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	672 symbol_table::cache_name (uf->scope (), nm);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	673 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	674 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	675 success = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	676 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	677 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	678 success = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	679 }
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	680 }
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	681 else
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	682 {
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	683 std::string octaveroot;
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	684 std::string fpath;
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	685
8021 85184151822e fix typo in NPOS change John W. Eaton <jwe@octave.org> parents: 8019 diff changeset	686 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	687 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	688 size_t pos1 = nm.find_first_of ("\n");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	689 size_t pos2 = nm.find_first_of ("\n", pos1 + 1);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	690 octaveroot = nm.substr (pos1 + 1, pos2 - pos1 - 1);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	691 fpath = nm.substr (pos2 + 1);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	692 nm = nm.substr (0, pos1);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	693 }
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	694
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	695 success = set_fcn (octaveroot, fpath);
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	696 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11541 diff changeset	697
12714 65b7ce254ba3 Fix loading of function handles saved in binary format. Bug #33456. Olaf Till <olaf.till@uni-jena.de> parents: 12483 diff changeset	698 return success;
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	699 }
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	700
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	701 #if defined (HAVE_HDF5)
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	702 bool
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	703 octave_fcn_handle::save_hdf5 (hid_t loc_id, const char *name,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	704 bool save_as_floats)
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	705 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	706 bool retval = true;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	707
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	708 hid_t group_hid = -1;
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	709 #if HAVE_HDF5_18
ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	710 group_hid = H5Gcreate (loc_id, name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	711 #else
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	712 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	713 #endif
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	714 if (group_hid < 0)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	715 return false;
4988 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 hid_t space_hid = -1, data_hid = -1, type_hid = -1;;
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	718
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	719 // attach the type of the variable
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	720 type_hid = H5Tcopy (H5T_C_S1);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	721 H5Tset_size (type_hid, nm.length () + 1);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	722 if (type_hid < 0)
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	723 {
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	724 H5Gclose (group_hid);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	725 return false;
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
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	728 OCTAVE_LOCAL_BUFFER (hsize_t, hdims, 2);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	729 hdims[0] = 0;
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	730 hdims[1] = 0;
5760 8d7162924bd3 [project @ 2006-04-14 04:01:37 by jwe] jwe parents: 5663 diff changeset	731 space_hid = H5Screate_simple (0 , hdims, 0);
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	732 if (space_hid < 0)
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	733 {
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	734 H5Tclose (type_hid);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	735 H5Gclose (group_hid);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	736 return false;
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	737 }
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 #if HAVE_HDF5_18
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11541 diff changeset	739 data_hid = H5Dcreate (group_hid, "nm", type_hid, space_hid,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	740 H5P_DEFAULT, H5P_DEFAULT, 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	741 #else
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	742 data_hid = H5Dcreate (group_hid, "nm", type_hid, space_hid, 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	743 #endif
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	744 if (data_hid < 0 \|\| H5Dwrite (data_hid, type_hid, H5S_ALL, H5S_ALL,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	745 H5P_DEFAULT, nm.c_str ()) < 0)
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	746 {
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	747 H5Sclose (space_hid);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	748 H5Tclose (type_hid);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	749 H5Gclose (group_hid);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	750 return false;
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	751 }
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	752 H5Dclose (data_hid);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	753
10261 a4fb4675accb make printing of handles more Matlab-compatible Jaroslav Hajek <highegg@gmail.com> parents: 10250 diff changeset	754 if (nm == anonymous)
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	755 {
5765 7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5760 diff changeset	756 std::ostringstream buf;
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	757 print_raw (buf, true);
5765 7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5760 diff changeset	758 std::string stmp = buf.str ();
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	759
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	760 // attach the type of the variable
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	761 H5Tset_size (type_hid, stmp.length () + 1);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	762 if (type_hid < 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	763 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	764 H5Sclose (space_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	765 H5Gclose (group_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	766 return false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	767 }
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	768
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 #if HAVE_HDF5_18
ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	770 data_hid = H5Dcreate (group_hid, "fcn", type_hid, space_hid,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	771 H5P_DEFAULT, H5P_DEFAULT, 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 #else
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	773 data_hid = H5Dcreate (group_hid, "fcn", type_hid, space_hid,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	774 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	775 #endif
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	776 if (data_hid < 0 \|\| H5Dwrite (data_hid, type_hid, H5S_ALL, H5S_ALL,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	777 H5P_DEFAULT, stmp.c_str ()) < 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	778 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	779 H5Sclose (space_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	780 H5Tclose (type_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	781 H5Gclose (group_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	782 return false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	783 }
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	784
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	785 H5Dclose (data_hid);
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	786
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	787 octave_user_function *f = fcn.user_function_value ();
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	788
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	789 std::list<symbol_table::symbol_record> vars
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	790 = symbol_table::all_variables (f->scope (), 0);
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 {
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	800 #if 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,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	803 H5P_DEFAULT, 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",
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	807 H5T_NATIVE_IDX, as_id, 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;
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	823 #if HAVE_HDF5_18
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	824 data_hid = H5Gcreate (group_hid, "symbol table", H5P_DEFAULT, H5P_DEFAULT, 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	825 #else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	826 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	827 #endif
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11541 diff changeset	828 if (data_hid < 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	829 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	830 H5Sclose (space_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	831 H5Tclose (type_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	832 H5Gclose (group_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	833 return false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	834 }
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	835
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	836 for (std::list<symbol_table::symbol_record>::const_iterator p = vars.begin ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	837 p != vars.end (); p++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	838 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	839 if (! add_hdf5_data (data_hid, p->varval (), p->name (),
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 {
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	848 std::string octaveroot = OCTAVE_EXEC_PREFIX;
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 ();
14b841c47a5f handle load/save for handles to built-in functions John W. Eaton <jwe@octave.org> parents: 7740 diff changeset	851 std::string fpath = f ? f->fcn_file_name () : std::string ();
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 ();
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	856 space_hid = H5Screate_simple (0 , hdims, 0);
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);
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	867 #if HAVE_HDF5_18
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",
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	869 type_hid, space_hid, H5P_DEFAULT, 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",
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	872 type_hid, space_hid, 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 ();
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	892 space_hid = H5Screate_simple (0 , hdims, 0);
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
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	904 #if 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,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	906 H5P_DEFAULT, 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
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	908 a_id = H5Acreate (group_hid, "FILE", type_hid, space_hid, 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;
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	926 }
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	927
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	928 bool
9881 b3089dba88bf Remove HDF5 cruft for older versions of HDF5 Kacper Kowalik parents: 9601 diff changeset	929 octave_fcn_handle::load_hdf5 (hid_t loc_id, const char *name)
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	930 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	931 bool success = true;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	932
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	933 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	934 hsize_t rank;
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	935 int slen;
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	936
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	937 #if HAVE_HDF5_18
ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	938 group_hid = H5Gopen (loc_id, name, H5P_DEFAULT);
ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	939 #else
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	940 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	941 #endif
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	942 if (group_hid < 0)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	943 return false;
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	944
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	945 #if HAVE_HDF5_18
ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	946 data_hid = H5Dopen (group_hid, "nm", H5P_DEFAULT);
ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	947 #else
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	948 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	949 #endif
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	950
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	951 if (data_hid < 0)
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	952 {
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	953 H5Gclose (group_hid);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	954 return false;
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	955 }
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	956
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	957 type_hid = H5Dget_type (data_hid);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	958 type_class_hid = H5Tget_class (type_hid);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	959
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	960 if (type_class_hid != H5T_STRING)
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	961 {
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	962 H5Tclose (type_hid);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	963 H5Dclose (data_hid);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	964 H5Gclose (group_hid);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	965 return false;
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	966 }
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 space_hid = H5Dget_space (data_hid);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	969 rank = H5Sget_simple_extent_ndims (space_hid);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	970
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	971 if (rank != 0)
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	972 {
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	973 H5Sclose (space_hid);
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 slen = H5Tget_size (type_hid);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	981 if (slen < 0)
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 H5Sclose (space_hid);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	984 H5Tclose (type_hid);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	985 H5Dclose (data_hid);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	986 H5Gclose (group_hid);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	987 return false;
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	988 }
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	989
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	990 OCTAVE_LOCAL_BUFFER (char, nm_tmp, slen);
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 // create datatype for (null-terminated) string to read into:
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	993 st_id = H5Tcopy (H5T_C_S1);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	994 H5Tset_size (st_id, slen);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	995
5760 8d7162924bd3 [project @ 2006-04-14 04:01:37 by jwe] jwe parents: 5663 diff changeset	996 if (H5Dread (data_hid, st_id, H5S_ALL, H5S_ALL, H5P_DEFAULT, nm_tmp) < 0)
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	997 {
6695 c45431c845f3 [project @ 2007-06-07 21:30:39 by dbateman] dbateman parents: 6657 diff changeset	998 H5Tclose (st_id);
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	999 H5Sclose (space_hid);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1000 H5Tclose (type_hid);
6695 c45431c845f3 [project @ 2007-06-07 21:30:39 by dbateman] dbateman parents: 6657 diff changeset	1001 H5Dclose (data_hid);
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1002 H5Gclose (group_hid);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1003 return false;
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1004 }
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1005 H5Tclose (st_id);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1006 H5Dclose (data_hid);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1007 nm = nm_tmp;
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1008
10261 a4fb4675accb make printing of handles more Matlab-compatible Jaroslav Hajek <highegg@gmail.com> parents: 10250 diff changeset	1009 if (nm == anonymous)
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1010 {
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	1011 #if HAVE_HDF5_18
ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	1012 data_hid = H5Dopen (group_hid, "fcn", H5P_DEFAULT);
ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	1013 #else
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1014 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	1015 #endif
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1016
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1017 if (data_hid < 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1018 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1019 H5Sclose (space_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1020 H5Tclose (type_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1021 H5Gclose (group_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1022 return false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1023 }
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1024
6695 c45431c845f3 [project @ 2007-06-07 21:30:39 by dbateman] dbateman parents: 6657 diff changeset	1025 H5Tclose (type_hid);
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1026 type_hid = H5Dget_type (data_hid);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1027 type_class_hid = H5Tget_class (type_hid);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1028
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1029 if (type_class_hid != H5T_STRING)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1030 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1031 H5Sclose (space_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1032 H5Tclose (type_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1033 H5Dclose (data_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1034 H5Gclose (group_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1035 return false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1036 }
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1037
6695 c45431c845f3 [project @ 2007-06-07 21:30:39 by dbateman] dbateman parents: 6657 diff changeset	1038 H5Sclose (space_hid);
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1039 space_hid = H5Dget_space (data_hid);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1040 rank = H5Sget_simple_extent_ndims (space_hid);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1041
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1042 if (rank != 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1043 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1044 H5Sclose (space_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1045 H5Tclose (type_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1046 H5Dclose (data_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1047 H5Gclose (group_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1048 return false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1049 }
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1050
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1051 slen = H5Tget_size (type_hid);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1052 if (slen < 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1053 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1054 H5Sclose (space_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1055 H5Tclose (type_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1056 H5Dclose (data_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1057 H5Gclose (group_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1058 return false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1059 }
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1060
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1061 OCTAVE_LOCAL_BUFFER (char, fcn_tmp, slen);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1062
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1063 // create datatype for (null-terminated) string to read into:
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1064 st_id = H5Tcopy (H5T_C_S1);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1065 H5Tset_size (st_id, slen);
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1066
5760 8d7162924bd3 [project @ 2006-04-14 04:01:37 by jwe] jwe parents: 5663 diff changeset	1067 if (H5Dread (data_hid, st_id, H5S_ALL, H5S_ALL, H5P_DEFAULT, fcn_tmp) < 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1068 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1069 H5Tclose (st_id);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1070 H5Sclose (space_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1071 H5Tclose (type_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1072 H5Dclose (data_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1073 H5Gclose (group_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1074 return false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1075 }
6695 c45431c845f3 [project @ 2007-06-07 21:30:39 by dbateman] dbateman parents: 6657 diff changeset	1076 H5Tclose (st_id);
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1077 H5Dclose (data_hid);
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1078
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1079 octave_idx_type len = 0;
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1080
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1081 // 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	1082 // 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	1083 // call H5Aopen for a non-existing attribute
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1084
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1085 H5E_auto_t err_func;
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1086 void *err_func_data;
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1087
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1088 // turn off error reporting temporarily, but save the error
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1089 // reporting function:
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	1090 #if HAVE_HDF5_18
ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	1091 H5Eget_auto (H5E_DEFAULT, &err_func, &err_func_data);
ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	1092 H5Eset_auto (H5E_DEFAULT, 0, 0);
ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	1093 #else
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1094 H5Eget_auto (&err_func, &err_func_data);
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1095 H5Eset_auto (0, 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	1096 #endif
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1097
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1098 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	1099
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1100 if (attr_id >= 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1101 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1102 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	1103 success = false;
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1104
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1105 H5Aclose (attr_id);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1106 }
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1107
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1108 // restore error reporting:
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 #if HAVE_HDF5_18
ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	1110 H5Eset_auto (H5E_DEFAULT, err_func, err_func_data);
ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	1111 #else
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1112 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	1113 #endif
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1114
10066 2cd940306a06 make unwind_protect frames local Jaroslav Hajek <highegg@gmail.com> parents: 9892 diff changeset	1115 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	1116
c6463412aebb eliminate symbol_table::scope_stack; fix scoping issue with evalin John W. Eaton <jwe@octave.org> parents: 8946 diff changeset	1117 // 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	1118 // 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	1119
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	1120 symbol_table::scope_id local_scope = symbol_table::alloc_scope ();
10066 2cd940306a06 make unwind_protect frames local Jaroslav Hajek <highegg@gmail.com> parents: 9892 diff changeset	1121 frame.add_fcn (symbol_table::erase_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	1122
c6463412aebb eliminate symbol_table::scope_stack; fix scoping issue with evalin John W. Eaton <jwe@octave.org> parents: 8946 diff changeset	1123 symbol_table::set_scope (local_scope);
c6463412aebb eliminate symbol_table::scope_stack; fix scoping issue with evalin John W. Eaton <jwe@octave.org> parents: 8946 diff changeset	1124
c6463412aebb eliminate symbol_table::scope_stack; fix scoping issue with evalin John W. Eaton <jwe@octave.org> parents: 8946 diff changeset	1125 octave_call_stack::push (local_scope, 0);
10066 2cd940306a06 make unwind_protect frames local Jaroslav Hajek <highegg@gmail.com> parents: 9892 diff changeset	1126 frame.add_fcn (octave_call_stack::pop);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	1127
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1128 if (len > 0 && success)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1129 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1130 hsize_t num_obj = 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	1131 #if HAVE_HDF5_18
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11541 diff changeset	1132 data_hid = H5Gopen (group_hid, "symbol table", 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	1133 #else
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11541 diff changeset	1134 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	1135 #endif
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1136 H5Gget_num_objs (data_hid, &num_obj);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1137 H5Gclose (data_hid);
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1138
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1139 if (num_obj != static_cast<hsize_t>(len))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1140 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1141 error ("load: failed to load anonymous function handle");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1142 success = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1143 }
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1144
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1145 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1146 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1147 hdf5_callback_data dsub;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1148 int current_item = 0;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1149 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	1150 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1151 if (H5Giterate (group_hid, "symbol table", &current_item,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1152 hdf5_read_next_data, &dsub) <= 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1153 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1154 error ("load: failed to load anonymous function handle");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1155 success = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1156 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1157 }
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1158
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1159 symbol_table::varref (dsub.name, local_scope) = dsub.tc;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1160 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1161 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1162 }
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1163
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1164 if (success)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1165 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1166 int parse_status;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11541 diff changeset	1167 octave_value anon_fcn_handle =
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1168 eval_string (fcn_tmp, true, parse_status);
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1169
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1170 if (parse_status == 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1171 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1172 octave_fcn_handle *fh = anon_fcn_handle.fcn_handle_value ();
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7756 diff changeset	1173
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1174 if (fh)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1175 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1176 fcn = fh->fcn;
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7756 diff changeset	1177
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1178 octave_user_function *uf = fcn.user_function_value (true);
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7756 diff changeset	1179
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1180 if (uf)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1181 symbol_table::cache_name (uf->scope (), nm);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1182 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1183 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1184 success = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1185 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1186 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1187 success = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1188 }
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1189
10066 2cd940306a06 make unwind_protect frames local Jaroslav Hajek <highegg@gmail.com> parents: 9892 diff changeset	1190 frame.run ();
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1191 }
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1192 else
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1193 {
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1194 std::string octaveroot;
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1195 std::string fpath;
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1196
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1197 // 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	1198 // 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	1199 // call H5Aopen for a non-existing attribute
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1200
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1201 H5E_auto_t err_func;
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1202 void *err_func_data;
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1203
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1204 // turn off error reporting temporarily, but save the error
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1205 // reporting function:
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	1206 #if HAVE_HDF5_18
ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	1207 H5Eget_auto (H5E_DEFAULT, &err_func, &err_func_data);
ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	1208 H5Eset_auto (H5E_DEFAULT, 0, 0);
ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	1209 #else
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1210 H5Eget_auto (&err_func, &err_func_data);
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1211 H5Eset_auto (0, 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	1212 #endif
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1213
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1214 hid_t attr_id = H5Aopen_name (group_hid, "OCTAVEROOT");
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1215 if (attr_id >= 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1216 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1217 H5Tclose (type_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1218 type_hid = H5Aget_type (attr_id);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1219 type_class_hid = H5Tget_class (type_hid);
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1220
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1221 if (type_class_hid != H5T_STRING)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1222 success = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1223 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1224 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1225 slen = H5Tget_size (type_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1226 st_id = H5Tcopy (H5T_C_S1);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1227 H5Tset_size (st_id, slen);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1228 OCTAVE_LOCAL_BUFFER (char, root_tmp, slen);
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1229
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1230 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	1231 success = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1232 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1233 octaveroot = root_tmp;
6695 c45431c845f3 [project @ 2007-06-07 21:30:39 by dbateman] dbateman parents: 6657 diff changeset	1234
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1235 H5Tclose (st_id);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1236 }
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 H5Aclose (attr_id);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1239 }
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1240
6695 c45431c845f3 [project @ 2007-06-07 21:30:39 by dbateman] dbateman parents: 6657 diff changeset	1241 if (success)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1242 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1243 attr_id = H5Aopen_name (group_hid, "FILE");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1244 if (attr_id >= 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1245 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1246 H5Tclose (type_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1247 type_hid = H5Aget_type (attr_id);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1248 type_class_hid = H5Tget_class (type_hid);
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1249
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1250 if (type_class_hid != H5T_STRING)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1251 success = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1252 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1253 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1254 slen = H5Tget_size (type_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1255 st_id = H5Tcopy (H5T_C_S1);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1256 H5Tset_size (st_id, slen);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1257 OCTAVE_LOCAL_BUFFER (char, path_tmp, slen);
6695 c45431c845f3 [project @ 2007-06-07 21:30:39 by dbateman] dbateman parents: 6657 diff changeset	1258
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1259 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	1260 success = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1261 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1262 fpath = path_tmp;
6695 c45431c845f3 [project @ 2007-06-07 21:30:39 by dbateman] dbateman parents: 6657 diff changeset	1263
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1264 H5Tclose (st_id);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1265 }
6695 c45431c845f3 [project @ 2007-06-07 21:30:39 by dbateman] dbateman parents: 6657 diff changeset	1266
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1267 H5Aclose (attr_id);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1268 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1269 }
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1270
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1271 // restore error reporting:
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	1272 #if HAVE_HDF5_18
ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	1273 H5Eset_auto (H5E_DEFAULT, err_func, err_func_data);
ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	1274 #else
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1275 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	1276 #endif
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1277
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1278 success = (success ? set_fcn (octaveroot, fpath) : success);
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1279 }
352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1280
6695 c45431c845f3 [project @ 2007-06-07 21:30:39 by dbateman] dbateman parents: 6657 diff changeset	1281 H5Tclose (type_hid);
c45431c845f3 [project @ 2007-06-07 21:30:39 by dbateman] dbateman parents: 6657 diff changeset	1282 H5Sclose (space_hid);
c45431c845f3 [project @ 2007-06-07 21:30:39 by dbateman] dbateman parents: 6657 diff changeset	1283 H5Gclose (group_hid);
c45431c845f3 [project @ 2007-06-07 21:30:39 by dbateman] dbateman parents: 6657 diff changeset	1284
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1285 return success;
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1286 }
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1287
7744 14b841c47a5f handle load/save for handles to built-in functions John W. Eaton <jwe@octave.org> parents: 7740 diff changeset	1288 #endif
14b841c47a5f handle load/save for handles to built-in functions John W. Eaton <jwe@octave.org> parents: 7740 diff changeset	1289
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11541 diff changeset	1290 /*
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1291
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1292 %!test
7744 14b841c47a5f handle load/save for handles to built-in functions John W. Eaton <jwe@octave.org> parents: 7740 diff changeset	1293 %! a = 2;
14b841c47a5f handle load/save for handles to built-in functions John W. Eaton <jwe@octave.org> parents: 7740 diff changeset	1294 %! f = @(x) a + x;
14b841c47a5f handle load/save for handles to built-in functions John W. Eaton <jwe@octave.org> parents: 7740 diff changeset	1295 %! 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	1296 %! hm = @version;
7745 0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7744 diff changeset	1297 %! hdld = @svd;
7744 14b841c47a5f handle load/save for handles to built-in functions John W. Eaton <jwe@octave.org> parents: 7740 diff changeset	1298 %! hbi = @log2;
14b841c47a5f handle load/save for handles to built-in functions John W. Eaton <jwe@octave.org> parents: 7740 diff changeset	1299 %! f2 = f;
14b841c47a5f handle load/save for handles to built-in functions John W. Eaton <jwe@octave.org> parents: 7740 diff changeset	1300 %! g2 = g;
14b841c47a5f handle load/save for handles to built-in functions John W. Eaton <jwe@octave.org> parents: 7740 diff changeset	1301 %! hm2 = hm;
14b841c47a5f handle load/save for handles to built-in functions John W. Eaton <jwe@octave.org> parents: 7740 diff changeset	1302 %! hdld2 = hdld;
14b841c47a5f handle load/save for handles to built-in functions John W. Eaton <jwe@octave.org> parents: 7740 diff changeset	1303 %! hbi2 = hbi;
14b841c47a5f handle load/save for handles to built-in functions John W. Eaton <jwe@octave.org> parents: 7740 diff changeset	1304 %! modes = {"-text", "-binary"};
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1305 %! if (!isempty(findstr(octave_config_info ("DEFS"),"HAVE_HDF5")))
7744 14b841c47a5f handle load/save for handles to built-in functions John W. Eaton <jwe@octave.org> parents: 7740 diff changeset	1306 %! modes(end+1) = "-hdf5";
14b841c47a5f handle load/save for handles to built-in functions John W. Eaton <jwe@octave.org> parents: 7740 diff changeset	1307 %! endif
7901 3e4c9b69069d call stack changes John W. Eaton <jwe@octave.org> parents: 7767 diff changeset	1308 %! for i = 1:numel (modes)
3e4c9b69069d call stack changes John W. Eaton <jwe@octave.org> parents: 7767 diff changeset	1309 %! mode = modes{i};
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1310 %! nm = tmpnam();
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1311 %! unwind_protect
7744 14b841c47a5f handle load/save for handles to built-in functions John W. Eaton <jwe@octave.org> parents: 7740 diff changeset	1312 %! 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	1313 %! clear f2 g2 hm2 hdld2 hbi2
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1314 %! load (nm);
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1315 %! assert (f(2),f2(2));
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1316 %! assert (g(2),g2(2));
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1317 %! assert (g(3),g2(3));
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1318 %! unlink (nm);
7744 14b841c47a5f handle load/save for handles to built-in functions John W. Eaton <jwe@octave.org> parents: 7740 diff changeset	1319 %! save (mode, nm, "f2", "g2", "hm2", "hdld2", "hbi2");
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1320 %! unwind_protect_cleanup
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1321 %! unlink (nm);
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1322 %! end_unwind_protect
7744 14b841c47a5f handle load/save for handles to built-in functions John W. Eaton <jwe@octave.org> parents: 7740 diff changeset	1323 %! endfor
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1324
5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1325 */
4988 352d228d409b [project @ 2004-09-11 13:05:38 by jwe] jwe parents: 4980 diff changeset	1326
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1327 void
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1328 octave_fcn_handle::print (std::ostream& os, bool pr_as_read_syntax) const
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1329 {
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1330 print_raw (os, pr_as_read_syntax);
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1331 newline (os);
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1332 }
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1333
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1334 void
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1335 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	1336 {
4980 003bbf6c13d8 [project @ 2004-09-09 15:47:17 by jwe] jwe parents: 4978 diff changeset	1337 bool printed = false;
003bbf6c13d8 [project @ 2004-09-09 15:47:17 by jwe] jwe parents: 4978 diff changeset	1338
10261 a4fb4675accb make printing of handles more Matlab-compatible Jaroslav Hajek <highegg@gmail.com> parents: 10250 diff changeset	1339 if (nm == anonymous)
4980 003bbf6c13d8 [project @ 2004-09-09 15:47:17 by jwe] jwe parents: 4978 diff changeset	1340 {
003bbf6c13d8 [project @ 2004-09-09 15:47:17 by jwe] jwe parents: 4978 diff changeset	1341 tree_print_code tpc (os);
003bbf6c13d8 [project @ 2004-09-09 15:47:17 by jwe] jwe parents: 4978 diff changeset	1342
4989 19b73a80e1d9 [project @ 2004-09-11 13:31:43 by jwe] jwe parents: 4988 diff changeset	1343 // 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	1344 // 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	1345
003bbf6c13d8 [project @ 2004-09-09 15:47:17 by jwe] jwe parents: 4978 diff changeset	1346 octave_value ftmp = fcn;
003bbf6c13d8 [project @ 2004-09-09 15:47:17 by jwe] jwe parents: 4978 diff changeset	1347
003bbf6c13d8 [project @ 2004-09-09 15:47:17 by jwe] jwe parents: 4978 diff changeset	1348 octave_user_function *f = ftmp.user_function_value ();
003bbf6c13d8 [project @ 2004-09-09 15:47:17 by jwe] jwe parents: 4978 diff changeset	1349
003bbf6c13d8 [project @ 2004-09-09 15:47:17 by jwe] jwe parents: 4978 diff changeset	1350 if (f)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1351 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1352 tree_parameter_list *p = f->parameter_list ();
4980 003bbf6c13d8 [project @ 2004-09-09 15:47:17 by jwe] jwe parents: 4978 diff changeset	1353
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1354 os << "@(";
4980 003bbf6c13d8 [project @ 2004-09-09 15:47:17 by jwe] jwe parents: 4978 diff changeset	1355
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1356 if (p)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1357 p->accept (tpc);
4980 003bbf6c13d8 [project @ 2004-09-09 15:47:17 by jwe] jwe parents: 4978 diff changeset	1358
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1359 os << ") ";
4980 003bbf6c13d8 [project @ 2004-09-09 15:47:17 by jwe] jwe parents: 4978 diff changeset	1360
11223 64e7538db12a fix printing of newlines for anonymous function handle bodies John W. Eaton <jwe@octave.org> parents: 11220 diff changeset	1361 tpc.print_fcn_handle_body (f->body ());
4980 003bbf6c13d8 [project @ 2004-09-09 15:47:17 by jwe] jwe parents: 4978 diff changeset	1362
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1363 printed = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1364 }
4980 003bbf6c13d8 [project @ 2004-09-09 15:47:17 by jwe] jwe parents: 4978 diff changeset	1365 }
003bbf6c13d8 [project @ 2004-09-09 15:47:17 by jwe] jwe parents: 4978 diff changeset	1366
003bbf6c13d8 [project @ 2004-09-09 15:47:17 by jwe] jwe parents: 4978 diff changeset	1367 if (! printed)
10261 a4fb4675accb make printing of handles more Matlab-compatible Jaroslav Hajek <highegg@gmail.com> parents: 10250 diff changeset	1368 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	1369 current_print_indent_level ());
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1370 }
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1371
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1372 octave_value
9463 d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9458 diff changeset	1373 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	1374 {
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1375 octave_value retval;
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1376
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	1377 // 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	1378
2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1379 // FIXME -- it seems ugly to put this here, but there is no single
2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1380 // 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	1381 // 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	1382 // 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	1383
2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1384 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	1385
2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1386 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	1387
2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1388 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	1389 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	1390 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	1391 {
2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1392 if (nm[0] == '.')
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1393 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1394 switch (nm[1])
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1395 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1396 case '\'':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1397 tnm = "transpose";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1398 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	1399
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1400 case '+':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1401 tnm = "plus";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1402 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	1403
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1404 case '-':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1405 tnm = "minus";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1406 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	1407
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1408 case '*':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1409 tnm = "times";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1410 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	1411
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1412 case '/':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1413 tnm = "rdivide";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1414 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	1415
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1416 case '^':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1417 tnm = "power";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1418 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	1419
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1420 case '\\':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1421 tnm = "ldivide";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1422 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1423 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1424 }
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	1425 else if (nm[1] == '=')
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1426 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1427 switch (nm[0])
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1428 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1429 case '<':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1430 tnm = "le";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1431 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	1432
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1433 case '=':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1434 tnm = "eq";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1435 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	1436
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1437 case '>':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1438 tnm = "ge";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1439 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	1440
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1441 case '~':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1442 case '!':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1443 tnm = "ne";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1444 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1445 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1446 }
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	1447 else if (nm == "**")
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1448 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	1449 }
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 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	1451 {
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 switch (nm[0])
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1453 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1454 case '~':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1455 case '!':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1456 tnm = "not";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1457 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	1458
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1459 case '\'':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1460 tnm = "ctranspose";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1461 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	1462
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1463 case '+':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1464 tnm = "plus";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1465 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	1466
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1467 case '-':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1468 tnm = "minus";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1469 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	1470
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1471 case '*':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1472 tnm = "mtimes";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1473 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	1474
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1475 case '/':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1476 tnm = "mrdivide";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1477 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	1478
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1479 case '^':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1480 tnm = "mpower";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1481 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	1482
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1483 case '\\':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1484 tnm = "mldivide";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1485 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	1486
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1487 case '<':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1488 tnm = "lt";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1489 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	1490
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1491 case '>':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1492 tnm = "gt";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1493 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	1494
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1495 case '&':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1496 tnm = "and";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1497 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	1498
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1499 case '\|':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1500 tnm = "or";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1501 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1502 }
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	1503 }
2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1504
9463 d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9458 diff changeset	1505 octave_value f = symbol_table::find_function (tnm, octave_value_list (),
d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9458 diff changeset	1506 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	1507
10321 97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1508 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	1509
11220 883b9308353c allow class function to be called from methods as well as constructors John W. Eaton <jwe@octave.org> parents: 11060 diff changeset	1510 // 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	1511 // for any class.
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11541 diff changeset	1512 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	1513 && (fptr->is_subfunction () \|\| fptr->is_private_function ()
10321 97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1514 \|\| fptr->is_class_constructor ()))
9458 0c7d84a65386 allow taking handles of methods with no base overload Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	1515 {
10321 97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1516 // Locally visible function.
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1517 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	1518 }
0c7d84a65386 allow taking handles of methods with no base overload Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	1519 else
10321 97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1520 {
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1521 // Globally visible (or no match yet). Query overloads.
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1522 std::list<std::string> classes = load_path::overloads (tnm);
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1523 bool any_match = fptr != 0 \|\| classes.size () > 0;
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1524 if (! any_match)
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1525 {
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1526 // No match found, try updating load_path and query classes again.
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1527 load_path::update ();
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1528 classes = load_path::overloads (tnm);
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1529 any_match = classes.size () > 0;
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1530 }
9458 0c7d84a65386 allow taking handles of methods with no base overload Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	1531
10321 97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1532 if (any_match)
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9419 diff changeset	1533 {
10321 97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1534 octave_fcn_handle *fh = new octave_fcn_handle (f, tnm);
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1535 retval = fh;
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1536
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1537 for (std::list<std::string>::iterator iter = classes.begin ();
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1538 iter != classes.end (); iter++)
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9419 diff changeset	1539 {
10321 97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1540 std::string class_name = *iter;
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1541 octave_value fmeth = symbol_table::find_method (tnm, class_name);
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9419 diff changeset	1542
10321 97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1543 bool is_builtin = false;
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1544 for (int i = 0; i < btyp_num_types; i++)
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1545 {
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1546 // FIXME: Too slow? Maybe binary lookup?
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1547 if (class_name == btyp_class_name[i])
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1548 {
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1549 is_builtin = true;
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1550 fh->set_overload (static_cast<builtin_type_t> (i), fmeth);
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1551 }
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1552 }
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1553
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1554 if (! is_builtin)
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1555 fh->set_overload (class_name, fmeth);
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1556 }
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9419 diff changeset	1557 }
10321 97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1558 else
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1559 error ("@%s: no function and no method found", tnm.c_str ());
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9419 diff changeset	1560 }
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1561
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1562 return retval;
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1563 }
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1564
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	1565 /*
2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1566 %!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	1567 %! 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	1568 %! ".'", "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	1569 %! ".+", "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	1570 %! ".-", "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	1571 %! ".*", "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	1572 %! "./", "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	1573 %! ".^", "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	1574 %! ".\\", "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	1575 %! "<=", "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	1576 %! "==", "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	1577 %! ">=", "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	1578 %! "~=", "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	1579 %! "!=", "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	1580 %! "**", "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	1581 %! "~", "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	1582 %! "!", "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	1583 %! "\'", "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	1584 %! "+", "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	1585 %! "-", "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	1586 %! "*", "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	1587 %! "/", "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	1588 %! "^", "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	1589 %! "\\", "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	1590 %! "<", "lt";
9343 70e0d3b1f26f fix typos in previous change John W. Eaton <jwe@octave.org> parents: 9342 diff changeset	1591 %! ">", "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	1592 %! "&", "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	1593 %! "\|", "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	1594 %! for i = 1:rows (x)
2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1595 %! assert (functions (str2func (x{i,1})).function, x{i,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	1596 %! 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	1597 */
2ca8879a140c allow function handles to be created from operators that correspond to named functions John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	1598
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: 4930 diff changeset	1599 DEFUN (functions, args, ,
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1600 "-- texinfo --\n\
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: 4930 diff changeset	1601 @deftypefn {Built-in Function} {} functions (@var{fcn_handle})\n\
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: 4930 diff changeset	1602 Return a struct containing information about the function handle\n\
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: 4930 diff changeset	1603 @var{fcn_handle}.\n\
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: 4930 diff changeset	1604 @end deftypefn")
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1605 {
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1606 octave_value retval;
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1607
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: 4930 diff changeset	1608 if (args.length () == 1)
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1609 {
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: 4930 diff changeset	1610 octave_fcn_handle *fh = args(0).fcn_handle_value ();
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1611
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1612 if (! error_state)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1613 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1614 octave_function *fcn = fh ? fh->function_value () : 0;
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1615
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1616 if (fcn)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1617 {
11060 54697b37d8bf replace Octave_map->octave_scalar_map in oct-parse.yy and ov-fcn-handle.cc Jaroslav Hajek <highegg@gmail.com> parents: 11029 diff changeset	1618 octave_scalar_map m;
4649 f7ce581b27fb [project @ 2003-11-23 21:46:44 by jwe] jwe parents: 4612 diff changeset	1619
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1620 std::string fh_nm = fh->fcn_name ();
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: 4930 diff changeset	1621
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1622 if (fh_nm == octave_fcn_handle::anonymous)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1623 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1624 std::ostringstream buf;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1625 fh->print_raw (buf);
11060 54697b37d8bf replace Octave_map->octave_scalar_map in oct-parse.yy and ov-fcn-handle.cc Jaroslav Hajek <highegg@gmail.com> parents: 11029 diff changeset	1626 m.setfield ("function", buf.str ());
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1627
11060 54697b37d8bf replace Octave_map->octave_scalar_map in oct-parse.yy and ov-fcn-handle.cc Jaroslav Hajek <highegg@gmail.com> parents: 11029 diff changeset	1628 m.setfield ("type", "anonymous");
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1629 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1630 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1631 {
11060 54697b37d8bf replace Octave_map->octave_scalar_map in oct-parse.yy and ov-fcn-handle.cc Jaroslav Hajek <highegg@gmail.com> parents: 11029 diff changeset	1632 m.setfield ("function", fh_nm);
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1633
11461 2b8531a6a3c9 Change mentions of "nested function" to the less misleading "subfunction" David Grundberg <individ@acc.umu.se> parents: 11223 diff changeset	1634 if (fcn->is_subfunction ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1635 {
11060 54697b37d8bf replace Octave_map->octave_scalar_map in oct-parse.yy and ov-fcn-handle.cc Jaroslav Hajek <highegg@gmail.com> parents: 11029 diff changeset	1636 m.setfield ("type", "subfunction");
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1637 Cell parentage (dim_vector (1, 2));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1638 parentage.elem(0) = fh_nm;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1639 parentage.elem(1) = fcn->parent_fcn_name ();
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11541 diff changeset	1640 m.setfield ("parentage", octave_value (parentage));
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1641 }
9509 c5330ef7aecd fix handles to private functions, simplify out-of-date checks in symtab Jaroslav Hajek <highegg@gmail.com> parents: 9466 diff changeset	1642 else if (fcn->is_private_function ())
11060 54697b37d8bf replace Octave_map->octave_scalar_map in oct-parse.yy and ov-fcn-handle.cc Jaroslav Hajek <highegg@gmail.com> parents: 11029 diff changeset	1643 m.setfield ("type", "private");
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9419 diff changeset	1644 else if (fh->is_overloaded ())
11060 54697b37d8bf replace Octave_map->octave_scalar_map in oct-parse.yy and ov-fcn-handle.cc Jaroslav Hajek <highegg@gmail.com> parents: 11029 diff changeset	1645 m.setfield ("type", "overloaded");
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1646 else
11060 54697b37d8bf replace Octave_map->octave_scalar_map in oct-parse.yy and ov-fcn-handle.cc Jaroslav Hajek <highegg@gmail.com> parents: 11029 diff changeset	1647 m.setfield ("type", "simple");
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1648 }
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: 4930 diff changeset	1649
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1650 std::string nm = fcn->fcn_file_name ();
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1651
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1652 if (fh_nm == octave_fcn_handle::anonymous)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1653 {
11060 54697b37d8bf replace Octave_map->octave_scalar_map in oct-parse.yy and ov-fcn-handle.cc Jaroslav Hajek <highegg@gmail.com> parents: 11029 diff changeset	1654 m.setfield ("file", nm);
7767 71f068b22fcc scope and context fixes for function handles John W. Eaton <jwe@octave.org> parents: 7761 diff changeset	1655
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1656 octave_user_function *fu = fh->user_function_value ();
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1657
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1658 std::list<symbol_table::symbol_record> vars
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1659 = symbol_table::all_variables (fu->scope (), 0);
7767 71f068b22fcc scope and context fixes for function handles John W. Eaton <jwe@octave.org> parents: 7761 diff changeset	1660
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1661 size_t varlen = vars.size ();
6625 5d02dfacfc9e [project @ 2007-05-16 08:49:47 by dbateman] dbateman parents: 6481 diff changeset	1662
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1663 if (varlen > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1664 {
11060 54697b37d8bf replace Octave_map->octave_scalar_map in oct-parse.yy and ov-fcn-handle.cc Jaroslav Hajek <highegg@gmail.com> parents: 11029 diff changeset	1665 octave_scalar_map ws;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1666 for (std::list<symbol_table::symbol_record>::const_iterator p = vars.begin ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1667 p != vars.end (); p++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1668 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1669 ws.assign (p->name (), p->varval (0));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1670 }
7767 71f068b22fcc scope and context fixes for function handles John W. Eaton <jwe@octave.org> parents: 7761 diff changeset	1671
11060 54697b37d8bf replace Octave_map->octave_scalar_map in oct-parse.yy and ov-fcn-handle.cc Jaroslav Hajek <highegg@gmail.com> parents: 11029 diff changeset	1672 m.setfield ("workspace", ws);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1673 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1674 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1675 else if (fcn->is_user_function () \|\| fcn->is_user_script ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1676 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1677 octave_function *fu = fh->function_value ();
11060 54697b37d8bf replace Octave_map->octave_scalar_map in oct-parse.yy and ov-fcn-handle.cc Jaroslav Hajek <highegg@gmail.com> parents: 11029 diff changeset	1678 m.setfield ("file", fu->fcn_file_name ());
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1679 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1680 else
11060 54697b37d8bf replace Octave_map->octave_scalar_map in oct-parse.yy and ov-fcn-handle.cc Jaroslav Hajek <highegg@gmail.com> parents: 11029 diff changeset	1681 m.setfield ("file", "");
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: 4930 diff changeset	1682
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1683 retval = m;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1684 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1685 else
12483 7a5aacf65f81 Rewrite error strings in src/ to use variables named in documentation. Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	1686 error ("functions: FCN_HANDLE is not a valid function handle object");
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1687 }
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1688 else
12483 7a5aacf65f81 Rewrite error strings in src/ to use variables named in documentation. Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	1689 error ("functions: FCN_HANDLE argument must be a function handle object");
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1690 }
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1691 else
5823 080c08b192d8 [project @ 2006-05-19 05:32:17 by jwe] jwe parents: 5775 diff changeset	1692 print_usage ();
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1693
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1694 return retval;
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1695 }
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1696
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: 4930 diff changeset	1697 DEFUN (func2str, args, ,
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1698 "-- texinfo --\n\
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: 4930 diff changeset	1699 @deftypefn {Built-in Function} {} func2str (@var{fcn_handle})\n\
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: 4930 diff changeset	1700 Return a string containing the name of the function referenced by\n\
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: 4930 diff changeset	1701 the function handle @var{fcn_handle}.\n\
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: 4930 diff changeset	1702 @end deftypefn")
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1703 {
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1704 octave_value retval;
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1705
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: 4930 diff changeset	1706 if (args.length () == 1)
4930 bdb307dc8613 [project @ 2004-08-05 04:55:26 by jwe] jwe parents: 4925 diff changeset	1707 {
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: 4930 diff changeset	1708 octave_fcn_handle *fh = args(0).fcn_handle_value ();
4930 bdb307dc8613 [project @ 2004-08-05 04:55:26 by jwe] jwe parents: 4925 diff changeset	1709
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: 4930 diff changeset	1710 if (! error_state && fh)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1711 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1712 std::string fh_nm = fh->fcn_name ();
6416 59a4304b7cc5 [project @ 2007-03-15 20:37:44 by jwe] jwe parents: 6351 diff changeset	1713
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1714 if (fh_nm == octave_fcn_handle::anonymous)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1715 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1716 std::ostringstream buf;
6416 59a4304b7cc5 [project @ 2007-03-15 20:37:44 by jwe] jwe parents: 6351 diff changeset	1717
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1718 fh->print_raw (buf);
6416 59a4304b7cc5 [project @ 2007-03-15 20:37:44 by jwe] jwe parents: 6351 diff changeset	1719
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1720 retval = buf.str ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1721 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1722 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1723 retval = fh_nm;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1724 }
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1725 else
12483 7a5aacf65f81 Rewrite error strings in src/ to use variables named in documentation. Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	1726 error ("func2str: FCN_HANDLE must be a valid function handle");
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1727 }
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1728 else
5823 080c08b192d8 [project @ 2006-05-19 05:32:17 by jwe] jwe parents: 5775 diff changeset	1729 print_usage ();
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1730
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1731 return retval;
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1732 }
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1733
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: 4930 diff changeset	1734 DEFUN (str2func, args, ,
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1735 "-- texinfo --\n\
10840 89f4d7e294cc Grammarcheck .cc files Rik <octave@nomad.inbox5.com> parents: 10322 diff changeset	1736 @deftypefn {Built-in Function} {} str2func (@var{fcn_name})\n\
9463 d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9458 diff changeset	1737 @deftypefnx {Built-in Function} {} str2func (@var{fcn_name}, \"global\")\n\
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: 4930 diff changeset	1738 Return a function handle constructed from the string @var{fcn_name}.\n\
9463 d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9458 diff changeset	1739 If the optional \"global\" argument is passed, locally visible functions\n\
d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9458 diff changeset	1740 are ignored in the lookup.\n\
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: 4930 diff changeset	1741 @end deftypefn")
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1742 {
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1743 octave_value retval;
9463 d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9458 diff changeset	1744 int nargin = args.length ();
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1745
9463 d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9458 diff changeset	1746 if (nargin == 1 \|\| nargin == 2)
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1747 {
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: 4930 diff changeset	1748 std::string nm = args(0).string_value ();
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1749
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: 4930 diff changeset	1750 if (! error_state)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	1751 retval = make_fcn_handle (nm, nargin != 2);
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1752 else
12483 7a5aacf65f81 Rewrite error strings in src/ to use variables named in documentation. Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	1753 error ("str2func: FCN_NAME must be a string");
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1754 }
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1755 else
5823 080c08b192d8 [project @ 2006-05-19 05:32:17 by jwe] jwe parents: 5775 diff changeset	1756 print_usage ();
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1757
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1758 return retval;
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1759 }
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1760
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1761 /*
14085 4e8f23ccadce test: Use internal prefix "__" for %!functions to avoid polluting workspace Rik <octave@nomad.inbox5.com> parents: 13696 diff changeset	1762
4e8f23ccadce test: Use internal prefix "__" for %!functions to avoid polluting workspace Rik <octave@nomad.inbox5.com> parents: 13696 diff changeset	1763 %!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	1764 %! if (nargin < 3)
71f068b22fcc scope and context fixes for function handles John W. Eaton <jwe@octave.org> parents: 7761 diff changeset	1765 %! n = 0;
71f068b22fcc scope and context fixes for function handles John W. Eaton <jwe@octave.org> parents: 7761 diff changeset	1766 %! endif
71f068b22fcc scope and context fixes for function handles John W. Eaton <jwe@octave.org> parents: 7761 diff changeset	1767 %! if (n > 2)
71f068b22fcc scope and context fixes for function handles John W. Eaton <jwe@octave.org> parents: 7761 diff changeset	1768 %! y = f (x);
71f068b22fcc scope and context fixes for function handles John W. Eaton <jwe@octave.org> parents: 7761 diff changeset	1769 %! else
71f068b22fcc scope and context fixes for function handles John W. Eaton <jwe@octave.org> parents: 7761 diff changeset	1770 %! n++;
14085 4e8f23ccadce test: Use internal prefix "__" for %!functions to avoid polluting workspace Rik <octave@nomad.inbox5.com> parents: 13696 diff changeset	1771 %! 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	1772 %! endif
14085 4e8f23ccadce test: Use internal prefix "__" for %!functions to avoid polluting workspace Rik <octave@nomad.inbox5.com> parents: 13696 diff changeset	1773 %!endfunction
4e8f23ccadce test: Use internal prefix "__" for %!functions to avoid polluting workspace Rik <octave@nomad.inbox5.com> parents: 13696 diff changeset	1774 %!
4e8f23ccadce test: Use internal prefix "__" for %!functions to avoid polluting workspace Rik <octave@nomad.inbox5.com> parents: 13696 diff changeset	1775 %!assert (__testrecursionfunc (@(x) x, 1), 8)
4e8f23ccadce test: Use internal prefix "__" for %!functions to avoid polluting workspace Rik <octave@nomad.inbox5.com> parents: 13696 diff changeset	1776
7767 71f068b22fcc scope and context fixes for function handles John W. Eaton <jwe@octave.org> parents: 7761 diff changeset	1777 */
10960 409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1778
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11541 diff changeset	1779 octave_fcn_binder::octave_fcn_binder (const octave_value& f,
10960 409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1780 const octave_value& root,
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11541 diff changeset	1781 const octave_value_list& templ,
12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11541 diff changeset	1782 const std::vector<int>& mask,
10960 409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1783 int exp_nargin)
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1784 : octave_fcn_handle (f), root_handle (root), arg_template (templ),
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1785 arg_mask (mask), expected_nargin (exp_nargin)
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1786 {
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1787 }
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1788
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1789 octave_fcn_handle *
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1790 octave_fcn_binder::maybe_binder (const octave_value& f)
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1791 {
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1792 octave_fcn_handle *retval = 0;
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1793
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1794 octave_user_function *usr_fcn = f.user_function_value (false);
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1795 tree_parameter_list *param_list = usr_fcn ? usr_fcn->parameter_list () : 0;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11541 diff changeset	1796
10960 409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1797 // Verify that the body is a single expression (always true in theory).
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11541 diff changeset	1798
10960 409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1799 tree_statement_list *cmd_list = usr_fcn ? usr_fcn->body () : 0;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11541 diff changeset	1800 tree_expression *body_expr = (cmd_list->length () == 1
10960 409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1801 ? cmd_list->front ()->expression () : 0);
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1802
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1803
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11541 diff changeset	1804 if (body_expr && body_expr->is_index_expression ()
10960 409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1805 && ! (param_list && param_list->takes_varargs ()))
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1806 {
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1807 // It's an index expression.
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1808 tree_index_expression idx_expr = dynamic_cast<tree_index_expression > (body_expr);
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1809 tree_expression *head_expr = idx_expr->expression ();
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1810 std::list<tree_argument_list *> arg_lists = idx_expr->arg_lists ();
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1811 std::string type_tags = idx_expr->type_tags ();
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1812
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1813 if (type_tags.length () == 1 && type_tags[0] == '('
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1814 && head_expr->is_identifier ())
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1815 {
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1816 assert (arg_lists.size () == 1);
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1817
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1818 // It's a single index expression: a(x,y,....)
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1819 tree_identifier head_id = dynamic_cast<tree_identifier > (head_expr);
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1820 tree_argument_list *arg_list = arg_lists.front ();
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1821
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1822 // Build a map of input params to their position.
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1823 std::map<std::string, int> arginmap;
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1824 int npar = 0;
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1825
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1826 if (param_list)
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1827 {
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1828 for (tree_parameter_list::iterator it = param_list->begin ();
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1829 it != param_list->end (); ++it, ++npar)
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1830 {
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1831 tree_decl_elt elt = it;
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1832 tree_identifier *id = elt ? elt->ident () : 0;
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1833 if (id && ! id->is_black_hole ())
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1834 arginmap[id->name ()] = npar;
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1835 }
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1836 }
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1837
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1838 if (arg_list && arg_list->length () > 0)
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1839 {
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1840 bool bad = false;
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1841 int nargs = arg_list->length ();
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1842 octave_value_list arg_template (nargs);
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1843 std::vector<int> arg_mask (nargs);
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1844
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1845 // Verify that each argument is either a named param, a constant, or a defined identifier.
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1846 int iarg = 0;
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1847 for (tree_argument_list::iterator it = arg_list->begin ();
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1848 it != arg_list->end (); ++it, ++iarg)
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1849 {
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1850 tree_expression elt = it;
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1851 if (elt && elt->is_constant ())
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1852 {
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1853 arg_template(iarg) = elt->rvalue1 ();
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1854 arg_mask[iarg] = -1;
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1855 }
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1856 else if (elt && elt->is_identifier ())
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1857 {
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1858 tree_identifier elt_id = dynamic_cast<tree_identifier > (elt);
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1859 if (arginmap.find (elt_id->name ()) != arginmap.end ())
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1860 {
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1861 arg_mask[iarg] = arginmap[elt_id->name ()];
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1862 }
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1863 else if (elt_id->is_defined ())
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1864 {
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1865 arg_template(iarg) = elt_id->rvalue1 ();
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1866 arg_mask[iarg] = -1;
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1867 }
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1868 else
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1869 {
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1870 bad = true;
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1871 break;
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1872 }
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1873 }
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1874 else
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1875 {
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1876 bad = true;
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1877 break;
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1878 }
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1879 }
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1880
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1881 octave_value root_val;
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1882
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1883 if (! bad)
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1884 {
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1885 // If the head is a value, use it as root.
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1886 if (head_id->is_defined ())
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1887 root_val = head_id->rvalue1 ();
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1888 else
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1889 {
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1890 // It's a name.
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1891 std::string head_name = head_id->name ();
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1892 // Function handles can't handle legacy dispatch, so
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1893 // we make sure it's not defined.
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1894 if (symbol_table::get_dispatch (head_name).size () > 0)
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1895 bad = true;
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1896 else
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1897 {
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1898 // Simulate try/catch.
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1899 unwind_protect frame;
11029 4ab04ea74b08 make an internal function for try simulation Jaroslav Hajek <highegg@gmail.com> parents: 10961 diff changeset	1900 interpreter_try (frame);
10960 409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1901
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1902 root_val = make_fcn_handle (head_name);
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1903 if (error_state)
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1904 bad = true;
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1905 }
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1906 }
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1907 }
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1908
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1909 if (! bad)
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1910 {
10961 2cc9b08bfd39 fixes in binders code Jaroslav Hajek <highegg@gmail.com> parents: 10960 diff changeset	1911 // Stash proper name tags.
2cc9b08bfd39 fixes in binders code Jaroslav Hajek <highegg@gmail.com> parents: 10960 diff changeset	1912 std::list<string_vector> arg_names = idx_expr->arg_names ();
2cc9b08bfd39 fixes in binders code Jaroslav Hajek <highegg@gmail.com> parents: 10960 diff changeset	1913 assert (arg_names.size () == 1);
2cc9b08bfd39 fixes in binders code Jaroslav Hajek <highegg@gmail.com> parents: 10960 diff changeset	1914 arg_template.stash_name_tags (arg_names.front ());
2cc9b08bfd39 fixes in binders code Jaroslav Hajek <highegg@gmail.com> parents: 10960 diff changeset	1915
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11541 diff changeset	1916 retval = new octave_fcn_binder (f, root_val, arg_template,
10960 409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1917 arg_mask, npar);
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1918 }
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1919 }
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1920 }
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
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1923 if (! retval)
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1924 retval = new octave_fcn_handle (f, octave_fcn_handle::anonymous);
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1925
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1926 return retval;
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
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1929 octave_value_list
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11541 diff changeset	1930 octave_fcn_binder::do_multi_index_op (int nargout,
10960 409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1931 const octave_value_list& args)
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1932 {
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1933 return do_multi_index_op (nargout, args, 0);
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1934 }
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1935
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1936 octave_value_list
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11541 diff changeset	1937 octave_fcn_binder::do_multi_index_op (int nargout,
10960 409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1938 const octave_value_list& args,
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1939 const std::list<octave_lvalue>* lvalue_list)
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1940 {
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1941 octave_value_list retval;
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1942
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1943 if (args.length () == expected_nargin)
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1944 {
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1945 for (int i = 0; i < arg_template.length (); i++)
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1946 {
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1947 int j = arg_mask[i];
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1948 if (j >= 0)
10961 2cc9b08bfd39 fixes in binders code Jaroslav Hajek <highegg@gmail.com> parents: 10960 diff changeset	1949 arg_template(i) = args(j); // May force a copy...
10960 409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1950 }
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1951
10961 2cc9b08bfd39 fixes in binders code Jaroslav Hajek <highegg@gmail.com> parents: 10960 diff changeset	1952 // Make a shallow copy of arg_template, to ensure consistency throughout the following
2cc9b08bfd39 fixes in binders code Jaroslav Hajek <highegg@gmail.com> parents: 10960 diff changeset	1953 // call even if we happen to get back here.
2cc9b08bfd39 fixes in binders code Jaroslav Hajek <highegg@gmail.com> parents: 10960 diff changeset	1954 octave_value_list tmp (arg_template);
2cc9b08bfd39 fixes in binders code Jaroslav Hajek <highegg@gmail.com> parents: 10960 diff changeset	1955 retval = root_handle.do_multi_index_op (nargout, tmp, lvalue_list);
10960 409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1956 }
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1957 else
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1958 retval = octave_fcn_handle::do_multi_index_op (nargout, args, lvalue_list);
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1959
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1960 return retval;
409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10849 diff changeset	1961 }
13696 d6118a2c0644 fix indexing bug for matrices inside anonymous functions John W. Eaton <jwe@octave.org> parents: 13193 diff changeset	1962
d6118a2c0644 fix indexing bug for matrices inside anonymous functions John W. Eaton <jwe@octave.org> parents: 13193 diff changeset	1963 /*
14085 4e8f23ccadce test: Use internal prefix "__" for %!functions to avoid polluting workspace Rik <octave@nomad.inbox5.com> parents: 13696 diff changeset	1964 %!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	1965 %! r = g(i);
d6118a2c0644 fix indexing bug for matrices inside anonymous functions John W. Eaton <jwe@octave.org> parents: 13193 diff changeset	1966 %!endfunction
d6118a2c0644 fix indexing bug for matrices inside anonymous functions John W. Eaton <jwe@octave.org> parents: 13193 diff changeset	1967 %!test
d6118a2c0644 fix indexing bug for matrices inside anonymous functions John W. Eaton <jwe@octave.org> parents: 13193 diff changeset	1968 %! 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	1969 %! 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	1970 */

Mercurial > octave-nkf

annotate src/ov-fcn-handle.cc @ 14085:4e8f23ccadce stable