Mercurial > octave-nkf
annotate src/ov-fcn-handle.cc @ 10066:2cd940306a06
make unwind_protect frames local
| author | Jaroslav Hajek <highegg@gmail.com> |
|---|---|
| date | Wed, 06 Jan 2010 13:18:41 +0100 |
| parents | ac69e6f4b33d |
| children | 090173f2db40 |
| rev | line source |
|---|---|
| 4343 | 1 /* |
| 2 | |
| 8920 | 3 Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 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. |
| 4343 | 5 |
| 6 This file is part of Octave. | |
| 7 | |
| 8 Octave is free software; you can redistribute it and/or modify it | |
| 9 under the terms of the GNU General Public License as published by the | |
| 7016 | 10 Free Software Foundation; either version 3 of the License, or (at your |
| 11 option) any later version. | |
| 4343 | 12 |
| 13 Octave is distributed in the hope that it will be useful, but WITHOUT | |
| 14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 16 for more details. | |
| 17 | |
| 18 You should have received a copy of the GNU General Public License | |
| 7016 | 19 along with Octave; see the file COPYING. If not, see |
| 20 <http://www.gnu.org/licenses/>. | |
| 4343 | 21 |
| 22 */ | |
| 23 | |
| 24 #ifdef HAVE_CONFIG_H | |
| 25 #include <config.h> | |
| 26 #endif | |
| 27 | |
| 28 #include <iostream> | |
| 5765 | 29 #include <sstream> |
| 5164 | 30 #include <vector> |
| 4343 | 31 |
| 7336 | 32 #include "file-ops.h" |
|
8377
25bc2d31e1bf
improve OCTAVE_LOCAL_BUFFER
Jaroslav Hajek <highegg@gmail.com>
parents:
8021
diff
changeset
|
33 #include "oct-locbuf.h" |
| 7336 | 34 |
| 4343 | 35 #include "defun.h" |
| 4654 | 36 #include "error.h" |
| 37 #include "gripes.h" | |
| 5663 | 38 #include "input.h" |
| 4343 | 39 #include "oct-map.h" |
| 40 #include "ov-base.h" | |
| 41 #include "ov-fcn-handle.h" | |
| 4980 | 42 #include "ov-usr-fcn.h" |
| 4343 | 43 #include "pr-output.h" |
| 4980 | 44 #include "pt-pr-code.h" |
| 45 #include "pt-misc.h" | |
| 46 #include "pt-stmt.h" | |
| 47 #include "pt-cmd.h" | |
| 48 #include "pt-exp.h" | |
| 49 #include "pt-assign.h" | |
| 4343 | 50 #include "variables.h" |
| 4988 | 51 #include "parse.h" |
| 6625 | 52 #include "unwind-prot.h" |
| 53 #include "defaults.h" | |
| 54 #include "file-stat.h" | |
| 55 #include "load-path.h" | |
| 56 #include "oct-env.h" | |
| 4988 | 57 |
| 58 #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
|
59 #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
|
60 #include "ls-hdf5.h" |
| 4988 | 61 #include "ls-oct-ascii.h" |
| 6625 | 62 #include "ls-oct-binary.h" |
| 4988 | 63 #include "ls-utils.h" |
| 4343 | 64 |
| 65 DEFINE_OCTAVE_ALLOCATOR (octave_fcn_handle); | |
| 66 | |
| 4612 | 67 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_fcn_handle, |
| 68 "function handle", | |
| 5946 | 69 "function_handle"); |
| 4343 | 70 |
|
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7756
diff
changeset
|
71 octave_fcn_handle::octave_fcn_handle (const octave_value& f, |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7756
diff
changeset
|
72 const std::string& n) |
|
9450
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
73 : fcn (f), nm (n) |
|
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7756
diff
changeset
|
74 { |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7756
diff
changeset
|
75 octave_user_function *uf = fcn.user_function_value (true); |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7756
diff
changeset
|
76 |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7756
diff
changeset
|
77 if (uf) |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7756
diff
changeset
|
78 symbol_table::cache_name (uf->scope (), nm); |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7756
diff
changeset
|
79 } |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7756
diff
changeset
|
80 |
| 4924 | 81 octave_value_list |
| 82 octave_fcn_handle::subsref (const std::string& type, | |
| 83 const std::list<octave_value_list>& idx, | |
| 84 int nargout) | |
| 85 { | |
| 86 octave_value_list retval; | |
| 87 | |
| 88 switch (type[0]) | |
| 89 { | |
| 90 case '(': | |
| 91 { | |
|
9450
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
92 int tmp_nargout = (type.length () > 1 && nargout == 0) ? 1 : nargout; |
| 5663 | 93 |
|
9450
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
94 retval = do_multi_index_op (tmp_nargout, idx.front ()); |
| 4924 | 95 } |
| 96 break; | |
| 97 | |
| 98 case '{': | |
| 99 case '.': | |
| 100 { | |
|
9450
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
101 std::string tnm = type_name (); |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
102 error ("%s cannot be indexed with %c", tnm.c_str (), type[0]); |
| 4924 | 103 } |
| 104 break; | |
| 105 | |
| 106 default: | |
| 107 panic_impossible (); | |
| 108 } | |
| 109 | |
|
9450
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
110 // FIXME -- perhaps there should be an |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
111 // octave_value_list::next_subsref member function? See also |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
112 // octave_builtin::subsref. |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
113 |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
114 if (idx.size () > 1) |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
115 retval = retval(0).next_subsref (nargout, type, idx); |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
116 |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
117 return retval; |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
118 } |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
119 |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
120 octave_value_list |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
121 octave_fcn_handle::do_multi_index_op (int nargout, |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
122 const octave_value_list& args) |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
123 { |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
124 octave_value_list retval; |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
125 |
|
9458
0c7d84a65386
allow taking handles of methods with no base overload
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
126 if (fcn.is_defined ()) |
|
9509
c5330ef7aecd
fix handles to private functions, simplify out-of-date checks in symtab
Jaroslav Hajek <highegg@gmail.com>
parents:
9466
diff
changeset
|
127 out_of_date_check (fcn, std::string (), false); |
|
9450
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
128 |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
129 if (disp.get () && ! args.empty ()) |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
130 { |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
131 // Possibly overloaded function. |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
132 octave_value ovfcn = fcn; |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
133 |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
134 // Get dynamic (class) dispatch type. |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
135 std::string ddt = get_dispatch_type (args); |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
136 |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
137 if (ddt.empty ()) |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
138 { |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
139 // Static dispatch (class of 1st arg)? |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
140 if (! disp->empty ()) |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
141 { |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
142 std::string sdt = args(0).class_name (); |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
143 str_ov_map::iterator pos = disp->find (sdt); |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
144 if (pos != disp->end ()) |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
145 { |
|
9509
c5330ef7aecd
fix handles to private functions, simplify out-of-date checks in symtab
Jaroslav Hajek <highegg@gmail.com>
parents:
9466
diff
changeset
|
146 out_of_date_check (pos->second, sdt, false); |
|
9450
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
147 ovfcn = pos->second; |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
148 } |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
149 } |
|
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 else |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
152 { |
|
9466
2ebd0717c12d
also cache class dispatch lookups in function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9463
diff
changeset
|
153 str_ov_map::iterator pos = disp->find (ddt); |
|
2ebd0717c12d
also cache class dispatch lookups in function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9463
diff
changeset
|
154 if (pos != disp->end ()) |
|
2ebd0717c12d
also cache class dispatch lookups in function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9463
diff
changeset
|
155 { |
|
9509
c5330ef7aecd
fix handles to private functions, simplify out-of-date checks in symtab
Jaroslav Hajek <highegg@gmail.com>
parents:
9466
diff
changeset
|
156 out_of_date_check (pos->second, ddt, false); |
|
9466
2ebd0717c12d
also cache class dispatch lookups in function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9463
diff
changeset
|
157 ovfcn = pos->second; |
|
2ebd0717c12d
also cache class dispatch lookups in function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9463
diff
changeset
|
158 } |
|
2ebd0717c12d
also cache class dispatch lookups in function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9463
diff
changeset
|
159 else |
|
2ebd0717c12d
also cache class dispatch lookups in function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9463
diff
changeset
|
160 { |
|
2ebd0717c12d
also cache class dispatch lookups in function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9463
diff
changeset
|
161 octave_value method = symbol_table::find_method (nm, ddt); |
|
2ebd0717c12d
also cache class dispatch lookups in function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9463
diff
changeset
|
162 if (method.is_defined ()) |
|
2ebd0717c12d
also cache class dispatch lookups in function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9463
diff
changeset
|
163 (*disp)[ddt] = ovfcn = method; |
|
2ebd0717c12d
also cache class dispatch lookups in function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9463
diff
changeset
|
164 } |
|
9450
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
165 } |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
166 |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
167 if (ovfcn.is_defined ()) |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
168 retval = ovfcn.do_multi_index_op (nargout, args); |
|
9458
0c7d84a65386
allow taking handles of methods with no base overload
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
169 else if (fcn.is_undefined ()) |
|
0c7d84a65386
allow taking handles of methods with no base overload
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
170 { |
|
0c7d84a65386
allow taking handles of methods with no base overload
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
171 if (ddt.empty ()) |
|
0c7d84a65386
allow taking handles of methods with no base overload
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
172 ddt = args(0).class_name (); |
|
0c7d84a65386
allow taking handles of methods with no base overload
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
173 |
|
0c7d84a65386
allow taking handles of methods with no base overload
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
174 error ("no %s method to handle class %s", nm.c_str (), ddt.c_str ()); |
|
0c7d84a65386
allow taking handles of methods with no base overload
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
175 } |
|
9450
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
176 else |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
177 error ("invalid function handle"); |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
178 } |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
179 else |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
180 { |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
181 // Non-overloaded function (anonymous, subfunction, private function). |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
182 if (fcn.is_defined ()) |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
183 retval = fcn.do_multi_index_op (nargout, args); |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
184 else |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
185 error ("invalid function handle"); |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
186 } |
| 4924 | 187 |
| 188 return retval; | |
| 189 } | |
| 190 | |
| 4988 | 191 bool |
| 6625 | 192 octave_fcn_handle::set_fcn (const std::string &octaveroot, |
| 193 const std::string& fpath) | |
| 4988 | 194 { |
| 6625 | 195 bool success = true; |
| 196 | |
|
7745
0ff0fc033f28
better handling of functions found by relative lookup
John W. Eaton <jwe@octave.org>
parents:
7744
diff
changeset
|
197 if (octaveroot.length () != 0 |
|
0ff0fc033f28
better handling of functions found by relative lookup
John W. Eaton <jwe@octave.org>
parents:
7744
diff
changeset
|
198 && fpath.length () >= octaveroot.length () |
|
0ff0fc033f28
better handling of functions found by relative lookup
John W. Eaton <jwe@octave.org>
parents:
7744
diff
changeset
|
199 && 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
|
200 && OCTAVE_EXEC_PREFIX != octaveroot) |
| 6625 | 201 { |
| 202 // First check if just replacing matlabroot is enough | |
| 203 std::string str = OCTAVE_EXEC_PREFIX + | |
| 204 fpath.substr (octaveroot.length ()); | |
| 205 file_stat fs (str); | |
| 206 | |
| 207 if (fs.exists ()) | |
| 208 { | |
|
8007
a2ab20ba78f7
make file_ops a proper singleton class
John W. Eaton <jwe@octave.org>
parents:
7901
diff
changeset
|
209 size_t xpos = str.find_last_of (file_ops::dir_sep_chars ()); |
| 6625 | 210 |
| 7336 | 211 std::string dir_name = str.substr (0, xpos); |
| 6625 | 212 |
| 7336 | 213 octave_function *xfcn |
| 214 = load_fcn_from_file (str, dir_name, "", nm); | |
| 6625 | 215 |
| 7336 | 216 if (xfcn) |
| 217 { | |
| 218 octave_value tmp (xfcn); | |
| 6625 | 219 |
| 7336 | 220 fcn = octave_value (new octave_fcn_handle (tmp, nm)); |
| 6625 | 221 } |
| 222 else | |
| 223 { | |
| 224 error ("function handle points to non-existent function"); | |
| 225 success = false; | |
| 226 } | |
| 227 } | |
| 228 else | |
| 229 { | |
| 230 // Next just search for it anywhere in the system path | |
| 231 string_vector names(3); | |
| 232 names(0) = nm + ".oct"; | |
| 233 names(1) = nm + ".mex"; | |
| 234 names(2) = nm + ".m"; | |
| 235 | |
| 6626 | 236 dir_path p (load_path::system_path ()); |
| 6625 | 237 |
| 238 str = octave_env::make_absolute | |
| 239 (p.find_first_of (names), octave_env::getcwd ()); | |
| 240 | |
|
8007
a2ab20ba78f7
make file_ops a proper singleton class
John W. Eaton <jwe@octave.org>
parents:
7901
diff
changeset
|
241 size_t xpos = str.find_last_of (file_ops::dir_sep_chars ()); |
| 6625 | 242 |
| 7336 | 243 std::string dir_name = str.substr (0, xpos); |
| 244 | |
| 245 octave_function *xfcn = load_fcn_from_file (str, dir_name, "", nm); | |
| 4989 | 246 |
| 7336 | 247 if (xfcn) |
| 248 { | |
| 249 octave_value tmp (xfcn); | |
| 6625 | 250 |
| 7336 | 251 fcn = octave_value (new octave_fcn_handle (tmp, nm)); |
| 6625 | 252 } |
| 253 else | |
| 254 { | |
| 255 error ("function handle points to non-existent function"); | |
| 256 success = false; | |
| 257 } | |
| 258 } | |
| 259 } | |
| 260 else | |
| 261 { | |
| 262 if (fpath.length () > 0) | |
| 263 { | |
|
8007
a2ab20ba78f7
make file_ops a proper singleton class
John W. Eaton <jwe@octave.org>
parents:
7901
diff
changeset
|
264 size_t xpos = fpath.find_last_of (file_ops::dir_sep_chars ()); |
| 6625 | 265 |
| 7336 | 266 std::string dir_name = fpath.substr (0, xpos); |
| 267 | |
| 268 octave_function *xfcn = load_fcn_from_file (fpath, dir_name, "", nm); | |
| 6625 | 269 |
| 7336 | 270 if (xfcn) |
| 271 { | |
| 272 octave_value tmp (xfcn); | |
| 6625 | 273 |
| 7336 | 274 fcn = octave_value (new octave_fcn_handle (tmp, nm)); |
| 6625 | 275 } |
| 276 else | |
| 277 { | |
| 278 error ("function handle points to non-existent function"); | |
| 279 success = false; | |
| 280 } | |
| 281 } | |
| 282 else | |
| 283 { | |
| 7336 | 284 fcn = symbol_table::find_function (nm); |
| 285 | |
| 6625 | 286 if (! fcn.is_function ()) |
| 287 { | |
| 288 error ("function handle points to non-existent function"); | |
| 289 success = false; | |
| 290 } | |
| 291 } | |
| 292 } | |
| 293 | |
| 294 return success; | |
| 295 } | |
| 296 | |
| 297 bool | |
| 6974 | 298 octave_fcn_handle::save_ascii (std::ostream& os) |
| 6625 | 299 { |
| 4988 | 300 if (nm == "@<anonymous>") |
| 301 { | |
| 6625 | 302 os << nm << "\n"; |
| 303 | |
| 4989 | 304 print_raw (os, true); |
| 305 os << "\n"; | |
| 6625 | 306 |
| 7336 | 307 if (fcn.is_undefined ()) |
| 6625 | 308 return false; |
| 309 | |
| 310 octave_user_function *f = fcn.user_function_value (); | |
| 311 | |
| 7336 | 312 std::list<symbol_table::symbol_record> vars |
|
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
313 = symbol_table::all_variables (f->scope (), 0); |
| 6625 | 314 |
| 7336 | 315 size_t varlen = vars.size (); |
| 6625 | 316 |
| 317 if (varlen > 0) | |
| 318 { | |
| 319 os << "# length: " << varlen << "\n"; | |
| 320 | |
| 7336 | 321 for (std::list<symbol_table::symbol_record>::const_iterator p = vars.begin (); |
| 322 p != vars.end (); p++) | |
| 6625 | 323 { |
| 7336 | 324 if (! save_ascii_data (os, p->varval (), p->name (), false, 0)) |
| 6625 | 325 return os; |
| 326 } | |
| 327 } | |
| 328 } | |
| 329 else | |
| 330 { | |
|
7744
14b841c47a5f
handle load/save for handles to built-in functions
John W. Eaton <jwe@octave.org>
parents:
7740
diff
changeset
|
331 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
|
332 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
|
333 |
| 6625 | 334 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
|
335 if (! fnm.empty ()) |
|
14b841c47a5f
handle load/save for handles to built-in functions
John W. Eaton <jwe@octave.org>
parents:
7740
diff
changeset
|
336 os << "# path: " << fnm << "\n"; |
| 6625 | 337 os << nm << "\n"; |
| 4988 | 338 } |
| 339 | |
| 340 return true; | |
| 341 } | |
| 342 | |
| 343 bool | |
| 344 octave_fcn_handle::load_ascii (std::istream& is) | |
| 345 { | |
| 6625 | 346 bool success = true; |
| 347 | |
| 348 std::streampos pos = is.tellg (); | |
| 349 std::string octaveroot = extract_keyword (is, "octaveroot", true); | |
| 350 if (octaveroot.length() == 0) | |
| 351 { | |
| 352 is.seekg (pos); | |
| 353 is.clear (); | |
| 354 } | |
| 355 pos = is.tellg (); | |
| 356 std::string fpath = extract_keyword (is, "path", true); | |
| 357 if (fpath.length() == 0) | |
| 358 { | |
| 359 is.seekg (pos); | |
| 360 is.clear (); | |
| 361 } | |
| 362 | |
| 4988 | 363 is >> nm; |
| 4989 | 364 |
| 4988 | 365 if (nm == "@<anonymous>") |
| 366 { | |
|
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
|
367 skip_preceeding_newline (is); |
| 4988 | 368 |
|
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
|
369 std::string buf; |
| 4988 | 370 |
| 371 if (is) | |
| 372 { | |
| 373 | |
| 374 // Get a line of text whitespace characters included, leaving | |
| 4989 | 375 // newline in the stream. |
|
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
|
376 buf = read_until_newline (is, true); |
| 4989 | 377 |
| 4988 | 378 } |
| 379 | |
| 6625 | 380 pos = is.tellg (); |
| 7336 | 381 |
|
10066
2cd940306a06
make unwind_protect frames local
Jaroslav Hajek <highegg@gmail.com>
parents:
9892
diff
changeset
|
382 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
|
383 |
|
c6463412aebb
eliminate symbol_table::scope_stack; fix scoping issue with evalin
John W. Eaton <jwe@octave.org>
parents:
8946
diff
changeset
|
384 // 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
|
385 // 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
|
386 |
| 7336 | 387 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
|
388 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
|
389 |
|
c6463412aebb
eliminate symbol_table::scope_stack; fix scoping issue with evalin
John W. Eaton <jwe@octave.org>
parents:
8946
diff
changeset
|
390 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
|
391 |
|
c6463412aebb
eliminate symbol_table::scope_stack; fix scoping issue with evalin
John W. Eaton <jwe@octave.org>
parents:
8946
diff
changeset
|
392 octave_call_stack::push (local_scope, 0); |
|
10066
2cd940306a06
make unwind_protect frames local
Jaroslav Hajek <highegg@gmail.com>
parents:
9892
diff
changeset
|
393 frame.add_fcn (octave_call_stack::pop); |
| 4988 | 394 |
|
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
|
395 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
|
396 |
| 6625 | 397 if (extract_keyword (is, "length", len, true) && len >= 0) |
| 4989 | 398 { |
| 6625 | 399 if (len > 0) |
| 400 { | |
| 401 for (octave_idx_type i = 0; i < len; i++) | |
| 402 { | |
| 403 octave_value t2; | |
| 404 bool dummy; | |
| 405 | |
| 406 std::string name | |
| 407 = read_ascii_data (is, std::string (), dummy, t2, i); | |
| 408 | |
| 409 if (!is) | |
| 410 { | |
| 411 error ("load: failed to load anonymous function handle"); | |
| 412 break; | |
| 413 } | |
| 414 | |
| 7901 | 415 symbol_table::varref (name, local_scope, 0) = t2; |
| 6625 | 416 } |
| 417 } | |
| 4989 | 418 } |
| 419 else | |
| 6625 | 420 { |
| 421 is.seekg (pos); | |
| 422 is.clear (); | |
| 423 } | |
| 424 | |
| 425 if (is && success) | |
| 426 { | |
| 427 int parse_status; | |
| 428 octave_value anon_fcn_handle = | |
|
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
|
429 eval_string (buf, true, parse_status); |
| 6625 | 430 |
| 431 if (parse_status == 0) | |
| 432 { | |
| 433 octave_fcn_handle *fh = | |
| 434 anon_fcn_handle.fcn_handle_value (); | |
|
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7756
diff
changeset
|
435 |
| 6625 | 436 if (fh) |
|
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7756
diff
changeset
|
437 { |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7756
diff
changeset
|
438 fcn = fh->fcn; |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7756
diff
changeset
|
439 |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7756
diff
changeset
|
440 octave_user_function *uf = fcn.user_function_value (true); |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7756
diff
changeset
|
441 |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7756
diff
changeset
|
442 if (uf) |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7756
diff
changeset
|
443 symbol_table::cache_name (uf->scope (), nm); |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7756
diff
changeset
|
444 } |
| 6625 | 445 else |
| 446 success = false; | |
| 447 } | |
| 448 else | |
| 449 success = false; | |
| 450 } | |
| 451 else | |
| 452 success = false; | |
| 4988 | 453 } |
| 454 else | |
| 6625 | 455 success = set_fcn (octaveroot, fpath); |
| 4988 | 456 |
| 6625 | 457 return success; |
| 4988 | 458 } |
| 459 | |
| 460 bool | |
| 6625 | 461 octave_fcn_handle::save_binary (std::ostream& os, bool& save_as_floats) |
| 4988 | 462 { |
| 463 if (nm == "@<anonymous>") | |
| 464 { | |
| 6625 | 465 std::ostringstream nmbuf; |
| 466 | |
| 7336 | 467 if (fcn.is_undefined ()) |
| 6625 | 468 return false; |
| 469 | |
| 470 octave_user_function *f = fcn.user_function_value (); | |
| 471 | |
| 7336 | 472 std::list<symbol_table::symbol_record> vars |
|
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
473 = symbol_table::all_variables (f->scope (), 0); |
| 6625 | 474 |
| 7336 | 475 size_t varlen = vars.size (); |
| 6625 | 476 |
| 477 if (varlen > 0) | |
| 478 nmbuf << nm << " " << varlen; | |
| 479 else | |
| 480 nmbuf << nm; | |
| 481 | |
| 482 std::string buf_str = nmbuf.str(); | |
| 483 int32_t tmp = buf_str.length (); | |
| 484 os.write (reinterpret_cast<char *> (&tmp), 4); | |
| 485 os.write (buf_str.c_str (), buf_str.length ()); | |
| 486 | |
| 5765 | 487 std::ostringstream buf; |
| 4988 | 488 print_raw (buf, true); |
| 5765 | 489 std::string stmp = buf.str (); |
| 4988 | 490 tmp = stmp.length (); |
| 5760 | 491 os.write (reinterpret_cast<char *> (&tmp), 4); |
| 4988 | 492 os.write (stmp.c_str (), stmp.length ()); |
| 6625 | 493 |
| 494 if (varlen > 0) | |
| 495 { | |
| 7336 | 496 for (std::list<symbol_table::symbol_record>::const_iterator p = vars.begin (); |
| 497 p != vars.end (); p++) | |
| 6625 | 498 { |
| 7336 | 499 if (! save_binary_data (os, p->varval (), p->name (), |
| 6625 | 500 "", 0, save_as_floats)) |
| 501 return os; | |
| 502 } | |
| 503 } | |
| 504 } | |
| 505 else | |
| 506 { | |
| 507 std::ostringstream nmbuf; | |
| 508 | |
|
7744
14b841c47a5f
handle load/save for handles to built-in functions
John W. Eaton <jwe@octave.org>
parents:
7740
diff
changeset
|
509 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
|
510 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
|
511 |
|
14b841c47a5f
handle load/save for handles to built-in functions
John W. Eaton <jwe@octave.org>
parents:
7740
diff
changeset
|
512 nmbuf << nm << "\n" << OCTAVE_EXEC_PREFIX << "\n" << fnm; |
| 6625 | 513 |
| 514 std::string buf_str = nmbuf.str (); | |
| 515 int32_t tmp = buf_str.length (); | |
| 516 os.write (reinterpret_cast<char *> (&tmp), 4); | |
| 517 os.write (buf_str.c_str (), buf_str.length ()); | |
| 4988 | 518 } |
| 7336 | 519 |
| 4988 | 520 return true; |
| 521 } | |
| 522 | |
| 523 bool | |
| 524 octave_fcn_handle::load_binary (std::istream& is, bool swap, | |
| 6625 | 525 oct_mach_info::float_format fmt) |
| 4988 | 526 { |
| 6625 | 527 bool success = true; |
| 7336 | 528 |
| 5828 | 529 int32_t tmp; |
| 5760 | 530 if (! is.read (reinterpret_cast<char *> (&tmp), 4)) |
| 4988 | 531 return false; |
| 532 if (swap) | |
| 533 swap_bytes<4> (&tmp); | |
| 534 | |
| 535 OCTAVE_LOCAL_BUFFER (char, ctmp1, tmp+1); | |
|
8378
7d0492aa522d
fix use of uninitialized buffers
Jaroslav Hajek <highegg@gmail.com>
parents:
8377
diff
changeset
|
536 is.get (ctmp1, tmp+1, 0); |
| 4988 | 537 nm = std::string (ctmp1); |
| 538 | |
| 539 if (! is) | |
| 540 return false; | |
| 541 | |
| 6625 | 542 if (nm.length() >= 12 && nm.substr (0, 12) == "@<anonymous>") |
| 4988 | 543 { |
| 6625 | 544 octave_idx_type len = 0; |
| 545 | |
| 546 if (nm.length() > 12) | |
| 547 { | |
| 548 std::istringstream nm_is (nm.substr(12)); | |
| 549 nm_is >> len; | |
| 550 nm = nm.substr(0,12); | |
| 551 } | |
| 552 | |
| 5760 | 553 if (! is.read (reinterpret_cast<char *> (&tmp), 4)) |
| 4988 | 554 return false; |
| 555 if (swap) | |
| 556 swap_bytes<4> (&tmp); | |
| 557 | |
| 558 OCTAVE_LOCAL_BUFFER (char, ctmp2, tmp+1); | |
|
8378
7d0492aa522d
fix use of uninitialized buffers
Jaroslav Hajek <highegg@gmail.com>
parents:
8377
diff
changeset
|
559 is.get (ctmp2, tmp+1, 0); |
| 4988 | 560 |
|
10066
2cd940306a06
make unwind_protect frames local
Jaroslav Hajek <highegg@gmail.com>
parents:
9892
diff
changeset
|
561 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
|
562 |
|
c6463412aebb
eliminate symbol_table::scope_stack; fix scoping issue with evalin
John W. Eaton <jwe@octave.org>
parents:
8946
diff
changeset
|
563 // 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
|
564 // 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
|
565 |
| 7336 | 566 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
|
567 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
|
568 |
|
c6463412aebb
eliminate symbol_table::scope_stack; fix scoping issue with evalin
John W. Eaton <jwe@octave.org>
parents:
8946
diff
changeset
|
569 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
|
570 |
|
c6463412aebb
eliminate symbol_table::scope_stack; fix scoping issue with evalin
John W. Eaton <jwe@octave.org>
parents:
8946
diff
changeset
|
571 octave_call_stack::push (local_scope, 0); |
|
10066
2cd940306a06
make unwind_protect frames local
Jaroslav Hajek <highegg@gmail.com>
parents:
9892
diff
changeset
|
572 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
|
573 |
| 6625 | 574 if (len > 0) |
| 4989 | 575 { |
| 6625 | 576 for (octave_idx_type i = 0; i < len; i++) |
| 577 { | |
| 578 octave_value t2; | |
| 579 bool dummy; | |
| 580 std::string doc; | |
| 581 | |
| 582 std::string name = | |
| 583 read_binary_data (is, swap, fmt, std::string (), | |
| 584 dummy, t2, doc); | |
| 585 | |
| 586 if (!is) | |
| 587 { | |
| 588 error ("load: failed to load anonymous function handle"); | |
| 589 break; | |
| 590 } | |
| 591 | |
| 7336 | 592 symbol_table::varref (name, local_scope) = t2; |
| 6625 | 593 } |
| 594 } | |
| 595 | |
| 596 if (is && success) | |
| 597 { | |
| 598 int parse_status; | |
| 599 octave_value anon_fcn_handle = | |
| 600 eval_string (ctmp2, true, parse_status); | |
| 601 | |
| 602 if (parse_status == 0) | |
| 603 { | |
| 604 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
|
605 |
| 6625 | 606 if (fh) |
|
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7756
diff
changeset
|
607 { |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7756
diff
changeset
|
608 fcn = fh->fcn; |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7756
diff
changeset
|
609 |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7756
diff
changeset
|
610 octave_user_function *uf = fcn.user_function_value (true); |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7756
diff
changeset
|
611 |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7756
diff
changeset
|
612 if (uf) |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7756
diff
changeset
|
613 symbol_table::cache_name (uf->scope (), nm); |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7756
diff
changeset
|
614 } |
| 6625 | 615 else |
| 616 success = false; | |
| 617 } | |
| 4989 | 618 else |
| 6625 | 619 success = false; |
| 4989 | 620 } |
| 4988 | 621 } |
| 622 else | |
| 623 { | |
| 6625 | 624 std::string octaveroot; |
| 625 std::string fpath; | |
| 626 | |
| 8021 | 627 if (nm.find_first_of ("\n") != std::string::npos) |
| 6225 | 628 { |
| 6625 | 629 size_t pos1 = nm.find_first_of ("\n"); |
| 630 size_t pos2 = nm.find_first_of ("\n", pos1 + 1); | |
| 631 octaveroot = nm.substr (pos1 + 1, pos2 - pos1 - 1); | |
| 632 fpath = nm.substr (pos2 + 1); | |
| 633 nm = nm.substr (0, pos1); | |
| 6225 | 634 } |
| 6625 | 635 |
| 636 success = set_fcn (octaveroot, fpath); | |
| 637 } | |
| 638 | |
| 639 return success; | |
| 4988 | 640 } |
| 641 | |
| 642 #if defined (HAVE_HDF5) | |
| 643 bool | |
| 644 octave_fcn_handle::save_hdf5 (hid_t loc_id, const char *name, | |
| 6625 | 645 bool save_as_floats) |
| 4988 | 646 { |
| 7336 | 647 bool retval = true; |
| 648 | |
| 4988 | 649 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
|
650 #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
|
651 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
|
652 #else |
| 4988 | 653 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
|
654 #endif |
| 7336 | 655 if (group_hid < 0) |
| 656 return false; | |
| 4988 | 657 |
| 658 hid_t space_hid = -1, data_hid = -1, type_hid = -1;; | |
| 659 | |
| 660 // attach the type of the variable | |
| 661 type_hid = H5Tcopy (H5T_C_S1); | |
| 662 H5Tset_size (type_hid, nm.length () + 1); | |
| 663 if (type_hid < 0) | |
| 664 { | |
| 665 H5Gclose (group_hid); | |
| 666 return false; | |
| 667 } | |
| 668 | |
| 669 OCTAVE_LOCAL_BUFFER (hsize_t, hdims, 2); | |
| 670 hdims[0] = 0; | |
| 671 hdims[1] = 0; | |
| 5760 | 672 space_hid = H5Screate_simple (0 , hdims, 0); |
| 4988 | 673 if (space_hid < 0) |
| 674 { | |
| 675 H5Tclose (type_hid); | |
| 676 H5Gclose (group_hid); | |
| 677 return false; | |
| 678 } | |
|
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
|
679 #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
|
680 data_hid = H5Dcreate (group_hid, "nm", type_hid, space_hid, |
|
ac69e6f4b33d
Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions
Kacper Kowalik <xarthisius.kk@gmail.com>
parents:
9881
diff
changeset
|
681 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
|
682 #else |
| 4988 | 683 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
|
684 #endif |
| 4988 | 685 if (data_hid < 0 || H5Dwrite (data_hid, type_hid, H5S_ALL, H5S_ALL, |
| 5760 | 686 H5P_DEFAULT, nm.c_str ()) < 0) |
| 4988 | 687 { |
| 688 H5Sclose (space_hid); | |
| 689 H5Tclose (type_hid); | |
| 690 H5Gclose (group_hid); | |
| 691 return false; | |
| 692 } | |
| 693 H5Dclose (data_hid); | |
| 694 | |
| 695 if (nm == "@<anonymous>") | |
| 696 { | |
| 5765 | 697 std::ostringstream buf; |
| 4988 | 698 print_raw (buf, true); |
| 5765 | 699 std::string stmp = buf.str (); |
| 4988 | 700 |
| 701 // attach the type of the variable | |
| 702 H5Tset_size (type_hid, stmp.length () + 1); | |
| 703 if (type_hid < 0) | |
| 704 { | |
| 6695 | 705 H5Sclose (space_hid); |
| 4988 | 706 H5Gclose (group_hid); |
| 707 return false; | |
| 708 } | |
| 709 | |
|
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
|
710 #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
|
711 data_hid = H5Dcreate (group_hid, "fcn", type_hid, space_hid, |
|
ac69e6f4b33d
Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions
Kacper Kowalik <xarthisius.kk@gmail.com>
parents:
9881
diff
changeset
|
712 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
|
713 #else |
| 4988 | 714 data_hid = H5Dcreate (group_hid, "fcn", type_hid, space_hid, |
| 715 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
|
716 #endif |
| 4988 | 717 if (data_hid < 0 || H5Dwrite (data_hid, type_hid, H5S_ALL, H5S_ALL, |
| 5760 | 718 H5P_DEFAULT, stmp.c_str ()) < 0) |
| 4988 | 719 { |
| 720 H5Sclose (space_hid); | |
| 721 H5Tclose (type_hid); | |
| 722 H5Gclose (group_hid); | |
| 723 return false; | |
| 724 } | |
| 725 | |
| 726 H5Dclose (data_hid); | |
| 6625 | 727 |
| 728 octave_user_function *f = fcn.user_function_value (); | |
| 729 | |
| 7336 | 730 std::list<symbol_table::symbol_record> vars |
|
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
731 = symbol_table::all_variables (f->scope (), 0); |
| 7336 | 732 |
| 733 size_t varlen = vars.size (); | |
| 6625 | 734 |
| 735 if (varlen > 0) | |
| 736 { | |
| 737 hid_t as_id = H5Screate (H5S_SCALAR); | |
| 738 | |
| 739 if (as_id >= 0) | |
| 740 { | |
|
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 #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
|
742 hid_t a_id = H5Acreate (group_hid, "SYMBOL_TABLE", |
|
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 H5T_NATIVE_IDX, as_id, |
|
ac69e6f4b33d
Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions
Kacper Kowalik <xarthisius.kk@gmail.com>
parents:
9881
diff
changeset
|
744 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
|
745 |
|
ac69e6f4b33d
Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions
Kacper Kowalik <xarthisius.kk@gmail.com>
parents:
9881
diff
changeset
|
746 #else |
| 6625 | 747 hid_t a_id = H5Acreate (group_hid, "SYMBOL_TABLE", |
| 748 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
|
749 #endif |
| 6625 | 750 |
| 751 if (a_id >= 0) | |
| 752 { | |
| 753 retval = (H5Awrite (a_id, H5T_NATIVE_IDX, &varlen) >= 0); | |
| 754 | |
| 755 H5Aclose (a_id); | |
| 756 } | |
| 757 else | |
| 758 retval = false; | |
| 759 | |
| 760 H5Sclose (as_id); | |
| 761 } | |
| 762 else | |
| 763 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
|
764 #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
|
765 data_hid = H5Gcreate (group_hid, "symbol table", 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
|
766 #else |
| 6625 | 767 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
|
768 #endif |
| 6625 | 769 if (data_hid < 0) |
| 770 { | |
| 771 H5Sclose (space_hid); | |
| 772 H5Tclose (type_hid); | |
| 773 H5Gclose (group_hid); | |
| 774 return false; | |
| 775 } | |
| 776 | |
| 7336 | 777 for (std::list<symbol_table::symbol_record>::const_iterator p = vars.begin (); |
| 778 p != vars.end (); p++) | |
| 6625 | 779 { |
| 7336 | 780 if (! add_hdf5_data (data_hid, p->varval (), p->name (), |
| 6625 | 781 "", false, save_as_floats)) |
| 782 break; | |
| 783 } | |
| 784 H5Gclose (data_hid); | |
| 785 } | |
| 786 } | |
| 787 else | |
| 788 { | |
| 789 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
|
790 |
|
14b841c47a5f
handle load/save for handles to built-in functions
John W. Eaton <jwe@octave.org>
parents:
7740
diff
changeset
|
791 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
|
792 std::string fpath = f ? f->fcn_file_name () : std::string (); |
| 6625 | 793 |
| 794 H5Sclose (space_hid); | |
| 795 hdims[0] = 1; | |
| 796 hdims[1] = octaveroot.length (); | |
| 797 space_hid = H5Screate_simple (0 , hdims, 0); | |
| 798 if (space_hid < 0) | |
| 799 { | |
| 800 H5Tclose (type_hid); | |
| 801 H5Gclose (group_hid); | |
| 802 return false; | |
| 803 } | |
| 804 | |
| 805 H5Tclose (type_hid); | |
| 806 type_hid = H5Tcopy (H5T_C_S1); | |
| 807 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
|
808 #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
|
809 hid_t a_id = H5Acreate (group_hid, "OCTAVEROOT", |
|
ac69e6f4b33d
Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions
Kacper Kowalik <xarthisius.kk@gmail.com>
parents:
9881
diff
changeset
|
810 type_hid, space_hid, 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
|
811 #else |
| 6625 | 812 hid_t a_id = H5Acreate (group_hid, "OCTAVEROOT", |
| 813 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
|
814 #endif |
| 6625 | 815 |
| 816 if (a_id >= 0) | |
| 817 { | |
| 818 retval = (H5Awrite (a_id, type_hid, octaveroot.c_str ()) >= 0); | |
| 819 | |
| 820 H5Aclose (a_id); | |
| 821 } | |
| 822 else | |
| 6695 | 823 { |
| 824 H5Sclose (space_hid); | |
| 825 H5Tclose (type_hid); | |
| 826 H5Gclose (group_hid); | |
| 827 return false; | |
| 828 } | |
| 6625 | 829 |
| 830 H5Sclose (space_hid); | |
| 831 hdims[0] = 1; | |
| 832 hdims[1] = fpath.length (); | |
| 833 space_hid = H5Screate_simple (0 , hdims, 0); | |
| 834 if (space_hid < 0) | |
| 835 { | |
| 836 H5Tclose (type_hid); | |
| 837 H5Gclose (group_hid); | |
| 838 return false; | |
| 839 } | |
| 840 | |
| 841 H5Tclose (type_hid); | |
| 842 type_hid = H5Tcopy (H5T_C_S1); | |
| 843 H5Tset_size (type_hid, fpath.length () + 1); | |
| 844 | |
|
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
|
845 #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
|
846 a_id = H5Acreate (group_hid, "FILE", type_hid, space_hid, |
|
ac69e6f4b33d
Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions
Kacper Kowalik <xarthisius.kk@gmail.com>
parents:
9881
diff
changeset
|
847 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
|
848 #else |
| 6625 | 849 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
|
850 #endif |
| 6625 | 851 |
| 852 if (a_id >= 0) | |
| 853 { | |
| 854 retval = (H5Awrite (a_id, type_hid, fpath.c_str ()) >= 0); | |
| 855 | |
| 856 H5Aclose (a_id); | |
| 857 } | |
| 858 else | |
| 859 retval = false; | |
| 4988 | 860 } |
| 861 | |
| 862 H5Sclose (space_hid); | |
| 863 H5Tclose (type_hid); | |
| 864 H5Gclose (group_hid); | |
| 865 | |
| 866 return retval; | |
| 867 } | |
| 868 | |
| 869 bool | |
|
9881
b3089dba88bf
Remove HDF5 cruft for older versions of HDF5
Kacper Kowalik
parents:
9601
diff
changeset
|
870 octave_fcn_handle::load_hdf5 (hid_t loc_id, const char *name) |
| 4988 | 871 { |
| 7336 | 872 bool success = true; |
| 873 | |
| 4988 | 874 hid_t group_hid, data_hid, space_hid, type_hid, type_class_hid, st_id; |
| 875 hsize_t rank; | |
| 876 int slen; | |
| 877 | |
|
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
|
878 #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
|
879 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
|
880 #else |
| 4988 | 881 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
|
882 #endif |
| 7336 | 883 if (group_hid < 0) |
| 884 return false; | |
| 4988 | 885 |
|
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
|
886 #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
|
887 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
|
888 #else |
| 4988 | 889 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
|
890 #endif |
| 4988 | 891 |
| 892 if (data_hid < 0) | |
| 893 { | |
| 894 H5Gclose (group_hid); | |
| 895 return false; | |
| 896 } | |
| 897 | |
| 898 type_hid = H5Dget_type (data_hid); | |
| 899 type_class_hid = H5Tget_class (type_hid); | |
| 900 | |
| 901 if (type_class_hid != H5T_STRING) | |
| 902 { | |
| 903 H5Tclose (type_hid); | |
| 904 H5Dclose (data_hid); | |
| 905 H5Gclose (group_hid); | |
| 906 return false; | |
| 907 } | |
| 908 | |
| 909 space_hid = H5Dget_space (data_hid); | |
| 910 rank = H5Sget_simple_extent_ndims (space_hid); | |
| 911 | |
| 912 if (rank != 0) | |
| 913 { | |
| 914 H5Sclose (space_hid); | |
| 915 H5Tclose (type_hid); | |
| 916 H5Dclose (data_hid); | |
| 917 H5Gclose (group_hid); | |
| 918 return false; | |
| 919 } | |
| 920 | |
| 921 slen = H5Tget_size (type_hid); | |
| 922 if (slen < 0) | |
| 923 { | |
| 924 H5Sclose (space_hid); | |
| 925 H5Tclose (type_hid); | |
| 926 H5Dclose (data_hid); | |
| 927 H5Gclose (group_hid); | |
| 928 return false; | |
| 929 } | |
| 930 | |
| 931 OCTAVE_LOCAL_BUFFER (char, nm_tmp, slen); | |
| 932 | |
| 933 // create datatype for (null-terminated) string to read into: | |
| 934 st_id = H5Tcopy (H5T_C_S1); | |
| 935 H5Tset_size (st_id, slen); | |
| 936 | |
| 5760 | 937 if (H5Dread (data_hid, st_id, H5S_ALL, H5S_ALL, H5P_DEFAULT, nm_tmp) < 0) |
| 4988 | 938 { |
| 6695 | 939 H5Tclose (st_id); |
| 4988 | 940 H5Sclose (space_hid); |
| 941 H5Tclose (type_hid); | |
| 6695 | 942 H5Dclose (data_hid); |
| 4988 | 943 H5Gclose (group_hid); |
| 944 return false; | |
| 945 } | |
| 946 H5Tclose (st_id); | |
| 947 H5Dclose (data_hid); | |
| 948 nm = nm_tmp; | |
| 949 | |
| 950 if (nm == "@<anonymous>") | |
| 951 { | |
|
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
|
952 #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
|
953 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
|
954 #else |
| 4988 | 955 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
|
956 #endif |
| 4988 | 957 |
| 958 if (data_hid < 0) | |
| 959 { | |
| 6695 | 960 H5Sclose (space_hid); |
| 961 H5Tclose (type_hid); | |
| 4988 | 962 H5Gclose (group_hid); |
| 963 return false; | |
| 964 } | |
| 965 | |
| 6695 | 966 H5Tclose (type_hid); |
| 4988 | 967 type_hid = H5Dget_type (data_hid); |
| 968 type_class_hid = H5Tget_class (type_hid); | |
| 969 | |
| 970 if (type_class_hid != H5T_STRING) | |
| 971 { | |
| 6695 | 972 H5Sclose (space_hid); |
| 4988 | 973 H5Tclose (type_hid); |
| 974 H5Dclose (data_hid); | |
| 975 H5Gclose (group_hid); | |
| 976 return false; | |
| 977 } | |
| 978 | |
| 6695 | 979 H5Sclose (space_hid); |
| 4988 | 980 space_hid = H5Dget_space (data_hid); |
| 981 rank = H5Sget_simple_extent_ndims (space_hid); | |
| 982 | |
| 983 if (rank != 0) | |
| 984 { | |
| 985 H5Sclose (space_hid); | |
| 986 H5Tclose (type_hid); | |
| 987 H5Dclose (data_hid); | |
| 988 H5Gclose (group_hid); | |
| 989 return false; | |
| 990 } | |
| 991 | |
| 992 slen = H5Tget_size (type_hid); | |
| 993 if (slen < 0) | |
| 994 { | |
| 995 H5Sclose (space_hid); | |
| 996 H5Tclose (type_hid); | |
| 997 H5Dclose (data_hid); | |
| 998 H5Gclose (group_hid); | |
| 999 return false; | |
| 1000 } | |
| 1001 | |
| 1002 OCTAVE_LOCAL_BUFFER (char, fcn_tmp, slen); | |
| 1003 | |
| 1004 // create datatype for (null-terminated) string to read into: | |
| 1005 st_id = H5Tcopy (H5T_C_S1); | |
| 1006 H5Tset_size (st_id, slen); | |
| 1007 | |
| 5760 | 1008 if (H5Dread (data_hid, st_id, H5S_ALL, H5S_ALL, H5P_DEFAULT, fcn_tmp) < 0) |
| 4988 | 1009 { |
| 6695 | 1010 H5Tclose (st_id); |
| 4988 | 1011 H5Sclose (space_hid); |
| 1012 H5Tclose (type_hid); | |
| 6695 | 1013 H5Dclose (data_hid); |
| 4988 | 1014 H5Gclose (group_hid); |
| 1015 return false; | |
| 1016 } | |
| 6695 | 1017 H5Tclose (st_id); |
| 4988 | 1018 H5Dclose (data_hid); |
| 6625 | 1019 |
| 1020 octave_idx_type len = 0; | |
| 1021 | |
| 1022 // we have to pull some shenanigans here to make sure | |
| 1023 // HDF5 doesn't print out all sorts of error messages if we | |
| 1024 // call H5Aopen for a non-existing attribute | |
| 1025 | |
| 1026 H5E_auto_t err_func; | |
| 1027 void *err_func_data; | |
| 4988 | 1028 |
| 6625 | 1029 // turn off error reporting temporarily, but save the error |
| 1030 // 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
|
1031 #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
|
1032 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
|
1033 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
|
1034 #else |
| 6625 | 1035 H5Eget_auto (&err_func, &err_func_data); |
| 1036 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
|
1037 #endif |
| 6625 | 1038 |
| 1039 hid_t attr_id = H5Aopen_name (group_hid, "SYMBOL_TABLE"); | |
| 4988 | 1040 |
| 6625 | 1041 if (attr_id >= 0) |
| 1042 { | |
| 1043 if (H5Aread (attr_id, H5T_NATIVE_IDX, &len) < 0) | |
| 1044 success = false; | |
| 1045 | |
| 1046 H5Aclose (attr_id); | |
| 1047 } | |
| 1048 | |
| 1049 // 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
|
1050 #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
|
1051 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
|
1052 #else |
| 6625 | 1053 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
|
1054 #endif |
| 6625 | 1055 |
|
10066
2cd940306a06
make unwind_protect frames local
Jaroslav Hajek <highegg@gmail.com>
parents:
9892
diff
changeset
|
1056 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
|
1057 |
|
c6463412aebb
eliminate symbol_table::scope_stack; fix scoping issue with evalin
John W. Eaton <jwe@octave.org>
parents:
8946
diff
changeset
|
1058 // 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
|
1059 // 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
|
1060 |
| 7336 | 1061 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
|
1062 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
|
1063 |
|
c6463412aebb
eliminate symbol_table::scope_stack; fix scoping issue with evalin
John W. Eaton <jwe@octave.org>
parents:
8946
diff
changeset
|
1064 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
|
1065 |
|
c6463412aebb
eliminate symbol_table::scope_stack; fix scoping issue with evalin
John W. Eaton <jwe@octave.org>
parents:
8946
diff
changeset
|
1066 octave_call_stack::push (local_scope, 0); |
|
10066
2cd940306a06
make unwind_protect frames local
Jaroslav Hajek <highegg@gmail.com>
parents:
9892
diff
changeset
|
1067 frame.add_fcn (octave_call_stack::pop); |
| 7336 | 1068 |
| 6625 | 1069 if (len > 0 && success) |
| 4989 | 1070 { |
| 6625 | 1071 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
|
1072 #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
|
1073 data_hid = H5Gopen (group_hid, "symbol table", 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
|
1074 #else |
| 6625 | 1075 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
|
1076 #endif |
| 6625 | 1077 H5Gget_num_objs (data_hid, &num_obj); |
| 1078 H5Gclose (data_hid); | |
| 1079 | |
| 1080 if (num_obj != static_cast<hsize_t>(len)) | |
| 1081 { | |
| 1082 error ("load: failed to load anonymous function handle"); | |
| 1083 success = false; | |
| 1084 } | |
| 1085 | |
| 1086 if (! error_state) | |
| 1087 { | |
| 1088 hdf5_callback_data dsub; | |
| 1089 int current_item = 0; | |
| 1090 for (octave_idx_type i = 0; i < len; i++) | |
| 1091 { | |
| 1092 if (H5Giterate (group_hid, "symbol table", ¤t_item, | |
| 1093 hdf5_read_next_data, &dsub) <= 0) | |
| 1094 { | |
| 1095 error ("load: failed to load anonymous function handle"); | |
| 1096 success = false; | |
| 1097 break; | |
| 1098 } | |
| 1099 | |
| 7336 | 1100 symbol_table::varref (dsub.name, local_scope) = dsub.tc; |
| 6625 | 1101 } |
| 1102 } | |
| 1103 } | |
| 1104 | |
| 1105 if (success) | |
| 1106 { | |
| 1107 int parse_status; | |
| 1108 octave_value anon_fcn_handle = | |
| 1109 eval_string (fcn_tmp, true, parse_status); | |
| 1110 | |
| 1111 if (parse_status == 0) | |
| 1112 { | |
| 1113 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
|
1114 |
| 6625 | 1115 if (fh) |
|
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7756
diff
changeset
|
1116 { |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7756
diff
changeset
|
1117 fcn = fh->fcn; |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7756
diff
changeset
|
1118 |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7756
diff
changeset
|
1119 octave_user_function *uf = fcn.user_function_value (true); |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7756
diff
changeset
|
1120 |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7756
diff
changeset
|
1121 if (uf) |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7756
diff
changeset
|
1122 symbol_table::cache_name (uf->scope (), nm); |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7756
diff
changeset
|
1123 } |
| 6625 | 1124 else |
| 1125 success = false; | |
| 1126 } | |
| 4989 | 1127 else |
| 6625 | 1128 success = false; |
| 4989 | 1129 } |
| 6625 | 1130 |
|
10066
2cd940306a06
make unwind_protect frames local
Jaroslav Hajek <highegg@gmail.com>
parents:
9892
diff
changeset
|
1131 frame.run (); |
| 4988 | 1132 } |
| 1133 else | |
| 1134 { | |
| 6625 | 1135 std::string octaveroot; |
| 1136 std::string fpath; | |
| 1137 | |
| 1138 // we have to pull some shenanigans here to make sure | |
| 1139 // HDF5 doesn't print out all sorts of error messages if we | |
| 1140 // call H5Aopen for a non-existing attribute | |
| 1141 | |
| 1142 H5E_auto_t err_func; | |
| 1143 void *err_func_data; | |
| 1144 | |
| 1145 // turn off error reporting temporarily, but save the error | |
| 1146 // 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
|
1147 #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
|
1148 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
|
1149 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
|
1150 #else |
| 6625 | 1151 H5Eget_auto (&err_func, &err_func_data); |
| 1152 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
|
1153 #endif |
| 6625 | 1154 |
| 1155 hid_t attr_id = H5Aopen_name (group_hid, "OCTAVEROOT"); | |
| 1156 if (attr_id >= 0) | |
| 6225 | 1157 { |
| 6695 | 1158 H5Tclose (type_hid); |
| 6625 | 1159 type_hid = H5Aget_type (attr_id); |
| 1160 type_class_hid = H5Tget_class (type_hid); | |
| 1161 | |
| 1162 if (type_class_hid != H5T_STRING) | |
| 1163 success = false; | |
| 1164 else | |
| 1165 { | |
| 1166 slen = H5Tget_size (type_hid); | |
| 1167 st_id = H5Tcopy (H5T_C_S1); | |
| 1168 H5Tset_size (st_id, slen); | |
| 1169 OCTAVE_LOCAL_BUFFER (char, root_tmp, slen); | |
| 1170 | |
| 1171 if (H5Aread (attr_id, st_id, root_tmp) < 0) | |
| 1172 success = false; | |
| 1173 else | |
| 1174 octaveroot = root_tmp; | |
| 6695 | 1175 |
| 1176 H5Tclose (st_id); | |
| 6625 | 1177 } |
| 1178 | |
| 1179 H5Aclose (attr_id); | |
| 6225 | 1180 } |
| 6625 | 1181 |
| 6695 | 1182 if (success) |
| 6625 | 1183 { |
| 6695 | 1184 attr_id = H5Aopen_name (group_hid, "FILE"); |
| 1185 if (attr_id >= 0) | |
| 1186 { | |
| 1187 H5Tclose (type_hid); | |
| 1188 type_hid = H5Aget_type (attr_id); | |
| 1189 type_class_hid = H5Tget_class (type_hid); | |
| 6625 | 1190 |
| 6695 | 1191 if (type_class_hid != H5T_STRING) |
| 6625 | 1192 success = false; |
| 1193 else | |
| 6695 | 1194 { |
| 1195 slen = H5Tget_size (type_hid); | |
| 1196 st_id = H5Tcopy (H5T_C_S1); | |
| 1197 H5Tset_size (st_id, slen); | |
| 1198 OCTAVE_LOCAL_BUFFER (char, path_tmp, slen); | |
| 1199 | |
| 1200 if (H5Aread (attr_id, st_id, path_tmp) < 0) | |
| 1201 success = false; | |
| 1202 else | |
| 1203 fpath = path_tmp; | |
| 1204 | |
| 1205 H5Tclose (st_id); | |
| 1206 } | |
| 1207 | |
| 1208 H5Aclose (attr_id); | |
| 6625 | 1209 } |
| 1210 } | |
| 1211 | |
| 1212 // 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
|
1213 #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
|
1214 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
|
1215 #else |
| 6625 | 1216 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
|
1217 #endif |
| 6625 | 1218 |
| 1219 success = (success ? set_fcn (octaveroot, fpath) : success); | |
| 4988 | 1220 } |
| 1221 | |
| 6695 | 1222 H5Tclose (type_hid); |
| 1223 H5Sclose (space_hid); | |
| 1224 H5Gclose (group_hid); | |
| 1225 | |
| 6625 | 1226 return success; |
| 4988 | 1227 } |
| 6625 | 1228 |
|
7744
14b841c47a5f
handle load/save for handles to built-in functions
John W. Eaton <jwe@octave.org>
parents:
7740
diff
changeset
|
1229 #endif |
|
14b841c47a5f
handle load/save for handles to built-in functions
John W. Eaton <jwe@octave.org>
parents:
7740
diff
changeset
|
1230 |
| 6625 | 1231 /* |
| 1232 | |
| 1233 %!test | |
|
7744
14b841c47a5f
handle load/save for handles to built-in functions
John W. Eaton <jwe@octave.org>
parents:
7740
diff
changeset
|
1234 %! a = 2; |
|
14b841c47a5f
handle load/save for handles to built-in functions
John W. Eaton <jwe@octave.org>
parents:
7740
diff
changeset
|
1235 %! f = @(x) a + x; |
|
14b841c47a5f
handle load/save for handles to built-in functions
John W. Eaton <jwe@octave.org>
parents:
7740
diff
changeset
|
1236 %! g = @(x) 2 * x; |
|
14b841c47a5f
handle load/save for handles to built-in functions
John W. Eaton <jwe@octave.org>
parents:
7740
diff
changeset
|
1237 %! hm = @flops; |
|
7745
0ff0fc033f28
better handling of functions found by relative lookup
John W. Eaton <jwe@octave.org>
parents:
7744
diff
changeset
|
1238 %! hdld = @svd; |
|
7744
14b841c47a5f
handle load/save for handles to built-in functions
John W. Eaton <jwe@octave.org>
parents:
7740
diff
changeset
|
1239 %! hbi = @log2; |
|
14b841c47a5f
handle load/save for handles to built-in functions
John W. Eaton <jwe@octave.org>
parents:
7740
diff
changeset
|
1240 %! f2 = f; |
|
14b841c47a5f
handle load/save for handles to built-in functions
John W. Eaton <jwe@octave.org>
parents:
7740
diff
changeset
|
1241 %! g2 = g; |
|
14b841c47a5f
handle load/save for handles to built-in functions
John W. Eaton <jwe@octave.org>
parents:
7740
diff
changeset
|
1242 %! hm2 = hm; |
|
14b841c47a5f
handle load/save for handles to built-in functions
John W. Eaton <jwe@octave.org>
parents:
7740
diff
changeset
|
1243 %! hdld2 = hdld; |
|
14b841c47a5f
handle load/save for handles to built-in functions
John W. Eaton <jwe@octave.org>
parents:
7740
diff
changeset
|
1244 %! hbi2 = hbi; |
|
14b841c47a5f
handle load/save for handles to built-in functions
John W. Eaton <jwe@octave.org>
parents:
7740
diff
changeset
|
1245 %! modes = {"-text", "-binary"}; |
| 6625 | 1246 %! 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
|
1247 %! modes(end+1) = "-hdf5"; |
|
14b841c47a5f
handle load/save for handles to built-in functions
John W. Eaton <jwe@octave.org>
parents:
7740
diff
changeset
|
1248 %! endif |
| 7901 | 1249 %! for i = 1:numel (modes) |
| 1250 %! mode = modes{i}; | |
| 6625 | 1251 %! nm = tmpnam(); |
| 1252 %! unwind_protect | |
|
7744
14b841c47a5f
handle load/save for handles to built-in functions
John W. Eaton <jwe@octave.org>
parents:
7740
diff
changeset
|
1253 %! 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
|
1254 %! clear f2 g2 hm2 hdld2 hbi2 |
| 6625 | 1255 %! load (nm); |
| 1256 %! assert (f(2),f2(2)); | |
| 1257 %! assert (g(2),g2(2)); | |
| 1258 %! assert (g(3),g2(3)); | |
| 1259 %! unlink (nm); | |
|
7744
14b841c47a5f
handle load/save for handles to built-in functions
John W. Eaton <jwe@octave.org>
parents:
7740
diff
changeset
|
1260 %! save (mode, nm, "f2", "g2", "hm2", "hdld2", "hbi2"); |
| 6625 | 1261 %! unwind_protect_cleanup |
| 1262 %! unlink (nm); | |
| 1263 %! end_unwind_protect | |
|
7744
14b841c47a5f
handle load/save for handles to built-in functions
John W. Eaton <jwe@octave.org>
parents:
7740
diff
changeset
|
1264 %! endfor |
| 6625 | 1265 |
| 1266 */ | |
| 4988 | 1267 |
| 4343 | 1268 void |
| 1269 octave_fcn_handle::print (std::ostream& os, bool pr_as_read_syntax) const | |
| 1270 { | |
| 1271 print_raw (os, pr_as_read_syntax); | |
| 1272 newline (os); | |
| 1273 } | |
| 1274 | |
| 1275 void | |
| 1276 octave_fcn_handle::print_raw (std::ostream& os, bool pr_as_read_syntax) const | |
| 1277 { | |
| 4980 | 1278 bool printed = false; |
| 1279 | |
| 1280 if (nm == "@<anonymous>") | |
| 1281 { | |
| 1282 tree_print_code tpc (os); | |
| 1283 | |
| 4989 | 1284 // FCN is const because this member function is, so we can't |
| 4980 | 1285 // use it to call user_function_value, so we make a copy first. |
| 1286 | |
| 1287 octave_value ftmp = fcn; | |
| 1288 | |
| 1289 octave_user_function *f = ftmp.user_function_value (); | |
| 1290 | |
| 1291 if (f) | |
| 1292 { | |
| 1293 tree_parameter_list *p = f->parameter_list (); | |
| 1294 | |
| 1295 os << "@("; | |
| 1296 | |
| 1297 if (p) | |
| 1298 p->accept (tpc); | |
| 1299 | |
| 1300 os << ") "; | |
| 1301 | |
| 1302 tree_statement_list *b = f->body (); | |
| 1303 | |
| 1304 if (b) | |
| 1305 { | |
| 1306 assert (b->length () == 1); | |
| 1307 | |
| 1308 tree_statement *s = b->front (); | |
| 1309 | |
| 1310 if (s) | |
| 1311 { | |
| 1312 if (s->is_expression ()) | |
| 1313 { | |
| 1314 tree_expression *e = s->expression (); | |
| 1315 | |
| 1316 if (e) | |
| 6657 | 1317 e->accept (tpc); |
| 4980 | 1318 } |
| 1319 else | |
| 1320 { | |
| 1321 tree_command *c = s->command (); | |
| 1322 | |
| 1323 tpc.suspend_newline (); | |
| 1324 c->accept (tpc); | |
| 1325 tpc.resume_newline (); | |
| 1326 } | |
| 1327 } | |
| 1328 } | |
| 1329 | |
| 1330 printed = true; | |
| 1331 } | |
| 1332 } | |
| 1333 | |
| 1334 if (! printed) | |
| 1335 octave_print_internal (os, nm, pr_as_read_syntax, | |
| 1336 current_print_indent_level ()); | |
| 4343 | 1337 } |
| 1338 | |
|
9450
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
1339 static string_vector |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
1340 get_builtin_classes (void) |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
1341 { |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
1342 // FIXME: this should really be read from somewhere else. |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
1343 static const char *cnames[15] = { |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
1344 "double", |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
1345 "single", |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
1346 "int8", |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
1347 "int16", |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
1348 "int32", |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
1349 "int64", |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
1350 "uint8", |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
1351 "uint16", |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
1352 "uint32", |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
1353 "uint64", |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
1354 "logical", |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
1355 "char", |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
1356 "cell", |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
1357 "struct", |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
1358 "function_handle" |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
1359 }; |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
1360 |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
1361 static string_vector retval; |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
1362 |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
1363 if (retval.is_empty ()) |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
1364 { |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
1365 retval = string_vector (15); |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
1366 for (int i = 0; i < 15; i++) |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
1367 retval(i) = cnames[i]; |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
1368 } |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
1369 |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
1370 return retval; |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
1371 } |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
1372 |
| 4343 | 1373 octave_value |
|
9463
d34baf412786
support non-local function lookups in str2func
Jaroslav Hajek <highegg@gmail.com>
parents:
9458
diff
changeset
|
1374 make_fcn_handle (const std::string& nm, bool local_funcs) |
| 4343 | 1375 { |
| 1376 octave_value retval; | |
| 1377 | |
|
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
|
1378 // 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
|
1379 |
|
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 // 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
|
1381 // 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
|
1382 // 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
|
1383 // 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
|
1384 |
|
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 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
|
1386 |
|
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 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
|
1388 |
|
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 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
|
1390 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
|
1391 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
|
1392 { |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1393 if (nm[0] == '.') |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1394 { |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1395 switch (nm[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
|
1396 { |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1397 case '\'': |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1398 tnm = "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
|
1399 break; |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1400 |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1401 case '+': |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1402 tnm = "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
|
1403 break; |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1404 |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1405 case '-': |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1406 tnm = "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
|
1407 break; |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1408 |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1409 case '*': |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1410 tnm = "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
|
1411 break; |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1412 |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1413 case '/': |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1414 tnm = "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
|
1415 break; |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1416 |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1417 case '^': |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1418 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
|
1419 break; |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1420 |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1421 case '\\': |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1422 tnm = "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
|
1423 break; |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1424 } |
|
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 } |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1426 else if (nm[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
|
1427 { |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1428 switch (nm[0]) |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1429 { |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1430 case '<': |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1431 tnm = "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
|
1432 break; |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1433 |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1434 case '=': |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1435 tnm = "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
|
1436 break; |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1437 |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1438 case '>': |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1439 tnm = "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
|
1440 break; |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1441 |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1442 case '~': |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1443 case '!': |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1444 tnm = "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
|
1445 break; |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1446 } |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1447 } |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1448 else if (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
|
1449 tnm = "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
|
1450 } |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1451 else if (len == 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
|
1452 { |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1453 switch (nm[0]) |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1454 { |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1455 case '~': |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1456 case '!': |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1457 tnm = "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
|
1458 break; |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1459 |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1460 case '\'': |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1461 tnm = "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
|
1462 break; |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1463 |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1464 case '+': |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1465 tnm = "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
|
1466 break; |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1467 |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1468 case '-': |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1469 tnm = "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
|
1470 break; |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1471 |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1472 case '*': |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1473 tnm = "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
|
1474 break; |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1475 |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1476 case '/': |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1477 tnm = "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
|
1478 break; |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1479 |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1480 case '^': |
|
9343
70e0d3b1f26f
fix typos in previous change
John W. Eaton <jwe@octave.org>
parents:
9342
diff
changeset
|
1481 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
|
1482 break; |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1483 |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1484 case '\\': |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1485 tnm = "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
|
1486 break; |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1487 |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1488 case '<': |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1489 tnm = "lt"; |
|
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 break; |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1491 |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1492 case '>': |
|
9343
70e0d3b1f26f
fix typos in previous change
John W. Eaton <jwe@octave.org>
parents:
9342
diff
changeset
|
1493 tnm = "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
|
1494 break; |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1495 |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1496 case '&': |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1497 tnm = "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
|
1498 break; |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1499 |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1500 case '|': |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1501 tnm = "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
|
1502 break; |
|
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 } |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1505 |
|
9458
0c7d84a65386
allow taking handles of methods with no base overload
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
1506 bool handle_ok = false; |
|
9463
d34baf412786
support non-local function lookups in str2func
Jaroslav Hajek <highegg@gmail.com>
parents:
9458
diff
changeset
|
1507 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
|
1508 local_funcs); |
|
9458
0c7d84a65386
allow taking handles of methods with no base overload
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
1509 |
|
0c7d84a65386
allow taking handles of methods with no base overload
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
1510 if (f.is_undefined ()) |
|
0c7d84a65386
allow taking handles of methods with no base overload
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
1511 { |
|
0c7d84a65386
allow taking handles of methods with no base overload
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
1512 if (load_path::any_class_method (tnm)) |
|
0c7d84a65386
allow taking handles of methods with no base overload
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
1513 handle_ok = true; |
|
0c7d84a65386
allow taking handles of methods with no base overload
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
1514 else |
|
0c7d84a65386
allow taking handles of methods with no base overload
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
1515 { |
|
0c7d84a65386
allow taking handles of methods with no base overload
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
1516 load_path::update (); |
|
0c7d84a65386
allow taking handles of methods with no base overload
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
1517 if (load_path::any_class_method (tnm)) |
|
0c7d84a65386
allow taking handles of methods with no base overload
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
1518 handle_ok = true; |
|
0c7d84a65386
allow taking handles of methods with no base overload
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
1519 } |
|
0c7d84a65386
allow taking handles of methods with no base overload
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
1520 } |
|
0c7d84a65386
allow taking handles of methods with no base overload
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
1521 else |
|
0c7d84a65386
allow taking handles of methods with no base overload
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
1522 handle_ok = true; |
|
0c7d84a65386
allow taking handles of methods with no base overload
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
1523 |
|
9450
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
1524 octave_function *fptr = f.is_defined () ? f.function_value () : 0; |
| 6481 | 1525 |
|
9458
0c7d84a65386
allow taking handles of methods with no base overload
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
1526 |
|
0c7d84a65386
allow taking handles of methods with no base overload
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
1527 if (handle_ok) |
|
9450
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
1528 { |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
1529 // If it's a subfunction, private function, or class constructor, |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
1530 // we want no dispatch. |
|
9458
0c7d84a65386
allow taking handles of methods with no base overload
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
1531 if (fptr && (fptr->is_nested_function () || fptr->is_private_function () |
|
0c7d84a65386
allow taking handles of methods with no base overload
Jaroslav Hajek <highegg@gmail.com>
parents:
9450
diff
changeset
|
1532 || fptr->is_class_constructor ())) |
|
9450
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
1533 retval = octave_value (new octave_fcn_handle (f, tnm)); |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
1534 else |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
1535 { |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
1536 typedef octave_fcn_handle::str_ov_map str_ov_map; |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
1537 std::auto_ptr<str_ov_map> disp (new str_ov_map); |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
1538 const string_vector cnames = get_builtin_classes (); |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
1539 for (octave_idx_type i = 0; i < cnames.length (); i++) |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
1540 { |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
1541 std::string cnam = cnames(i); |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
1542 octave_value method = symbol_table::find_method (tnm, cnam); |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
1543 if (method.is_defined ()) |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
1544 (*disp)[cnam] = method; |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
1545 } |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
1546 |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
1547 retval = octave_value (new octave_fcn_handle (f, tnm, disp.release ())); |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
1548 } |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
1549 } |
|
9419
0dd3c7a2ba19
undo escaped change in previous patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9418
diff
changeset
|
1550 else |
|
0dd3c7a2ba19
undo escaped change in previous patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9418
diff
changeset
|
1551 error ("error creating function handle \"@%s\"", nm.c_str ()); |
| 4343 | 1552 |
| 1553 return retval; | |
| 1554 } | |
| 1555 | |
|
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
|
1556 /* |
|
2ca8879a140c
allow function handles to be created from operators that correspond to named functions
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
1557 %!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
|
1558 %! 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
|
1559 %! ".'", "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
|
1560 %! ".+", "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
|
1561 %! ".-", "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
|
1562 %! ".*", "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
|
1563 %! "./", "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
|
1564 %! ".^", "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
|
1565 %! ".\\", "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
|
1566 %! "<=", "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
|
1567 %! "==", "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
|
1568 %! ">=", "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
|
1569 %! "~=", "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
|
1570 %! "!=", "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
|
1571 %! "**", "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
|
1572 %! "~", "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
|
1573 %! "!", "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
|
1574 %! "\'", "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
|
1575 %! "+", "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
|
1576 %! "-", "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
|
1577 %! "*", "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
|
1578 %! "/", "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
|
1579 %! "^", "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
|
1580 %! "\\", "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
|
1581 %! "<", "lt"; |
|
9343
70e0d3b1f26f
fix typos in previous change
John W. Eaton <jwe@octave.org>
parents:
9342
diff
changeset
|
1582 %! ">", "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
|
1583 %! "&", "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
|
1584 %! "|", "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
|
1585 %! 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
|
1586 %! 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
|
1587 %! 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
|
1588 */ |
|
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 |
| 4933 | 1590 DEFUN (functions, args, , |
| 4343 | 1591 "-*- texinfo -*-\n\ |
| 4933 | 1592 @deftypefn {Built-in Function} {} functions (@var{fcn_handle})\n\ |
| 1593 Return a struct containing information about the function handle\n\ | |
| 1594 @var{fcn_handle}.\n\ | |
| 1595 @end deftypefn") | |
| 4343 | 1596 { |
| 1597 octave_value retval; | |
| 1598 | |
| 4933 | 1599 if (args.length () == 1) |
| 4343 | 1600 { |
| 4933 | 1601 octave_fcn_handle *fh = args(0).fcn_handle_value (); |
| 4343 | 1602 |
| 1603 if (! error_state) | |
| 1604 { | |
|
7744
14b841c47a5f
handle load/save for handles to built-in functions
John W. Eaton <jwe@octave.org>
parents:
7740
diff
changeset
|
1605 octave_function *fcn = fh ? fh->function_value () : 0; |
| 4343 | 1606 |
| 4933 | 1607 if (fcn) |
| 4930 | 1608 { |
| 4933 | 1609 Octave_map m; |
| 4649 | 1610 |
| 4933 | 1611 std::string fh_nm = fh->fcn_name (); |
| 1612 | |
| 6625 | 1613 if (fh_nm == "@<anonymous>") |
| 1614 { | |
| 1615 std::ostringstream buf; | |
| 1616 fh->print_raw (buf); | |
| 1617 m.assign ("function", buf.str ()); | |
| 1618 | |
| 1619 m.assign ("type", "anonymous"); | |
| 1620 } | |
| 1621 else | |
| 1622 { | |
| 1623 m.assign ("function", fh_nm); | |
| 4343 | 1624 |
| 6625 | 1625 if (fcn->is_nested_function ()) |
| 1626 { | |
| 1627 m.assign ("type", "subfunction"); | |
| 1628 Cell parentage (dim_vector (1, 2)); | |
| 1629 parentage.elem(0) = fh_nm; | |
| 1630 parentage.elem(1) = fcn->parent_fcn_name (); | |
|
7756
45de7d8dac72
ov-fcn-handle.cc (Ffunctions): fix structure assignment
John W. Eaton <jwe@octave.org>
parents:
7745
diff
changeset
|
1631 m.assign ("parentage", octave_value (parentage)); |
| 6625 | 1632 } |
|
9509
c5330ef7aecd
fix handles to private functions, simplify out-of-date checks in symtab
Jaroslav Hajek <highegg@gmail.com>
parents:
9466
diff
changeset
|
1633 else if (fcn->is_private_function ()) |
|
c5330ef7aecd
fix handles to private functions, simplify out-of-date checks in symtab
Jaroslav Hajek <highegg@gmail.com>
parents:
9466
diff
changeset
|
1634 m.assign ("type", "private"); |
|
9450
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
1635 else if (fh->is_overloaded ()) |
|
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
9419
diff
changeset
|
1636 m.assign ("type", "overloaded"); |
| 6625 | 1637 else |
| 1638 m.assign ("type", "simple"); | |
| 1639 } | |
| 4933 | 1640 |
| 1641 std::string nm = fcn->fcn_file_name (); | |
| 4343 | 1642 |
|
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
1643 if (fh_nm == "@<anonymous>") |
| 4935 | 1644 { |
|
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
1645 m.assign ("file", nm); |
|
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
1646 |
|
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
1647 octave_user_function *fu = fh->user_function_value (); |
| 6625 | 1648 |
|
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
1649 std::list<symbol_table::symbol_record> vars |
|
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
1650 = symbol_table::all_variables (fu->scope (), 0); |
|
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
1651 |
|
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
1652 size_t varlen = vars.size (); |
| 6625 | 1653 |
|
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
1654 if (varlen > 0) |
|
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
1655 { |
|
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
1656 Octave_map ws; |
|
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
1657 for (std::list<symbol_table::symbol_record>::const_iterator p = vars.begin (); |
|
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
1658 p != vars.end (); p++) |
| 6625 | 1659 { |
|
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
1660 ws.assign (p->name (), p->varval (0)); |
| 6625 | 1661 } |
|
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
1662 |
|
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
1663 m.assign ("workspace", ws); |
| 6625 | 1664 } |
|
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
1665 } |
|
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
1666 else if (fcn->is_user_function () || fcn->is_user_script ()) |
|
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
1667 { |
|
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
1668 octave_function *fu = fh->function_value (); |
|
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
1669 m.assign ("file", fu->fcn_file_name ()); |
| 4935 | 1670 } |
| 4343 | 1671 else |
|
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
1672 m.assign ("file", ""); |
| 4933 | 1673 |
| 1674 retval = m; | |
| 4343 | 1675 } |
| 1676 else | |
| 4933 | 1677 error ("functions: invalid function handle object"); |
| 4343 | 1678 } |
| 1679 else | |
| 4933 | 1680 error ("functions: argument must be a function handle object"); |
| 4343 | 1681 } |
| 1682 else | |
| 5823 | 1683 print_usage (); |
| 4343 | 1684 |
| 1685 return retval; | |
| 1686 } | |
| 1687 | |
| 4933 | 1688 DEFUN (func2str, args, , |
| 4343 | 1689 "-*- texinfo -*-\n\ |
| 4933 | 1690 @deftypefn {Built-in Function} {} func2str (@var{fcn_handle})\n\ |
| 1691 Return a string containing the name of the function referenced by\n\ | |
| 1692 the function handle @var{fcn_handle}.\n\ | |
| 1693 @end deftypefn") | |
| 4343 | 1694 { |
| 1695 octave_value retval; | |
| 1696 | |
| 4933 | 1697 if (args.length () == 1) |
| 4930 | 1698 { |
| 4933 | 1699 octave_fcn_handle *fh = args(0).fcn_handle_value (); |
| 4930 | 1700 |
| 4933 | 1701 if (! error_state && fh) |
| 1702 { | |
| 1703 std::string fh_nm = fh->fcn_name (); | |
| 6416 | 1704 |
| 1705 if (fh_nm == "@<anonymous>") | |
| 1706 { | |
| 1707 std::ostringstream buf; | |
| 1708 | |
| 1709 fh->print_raw (buf); | |
| 1710 | |
| 1711 retval = buf.str (); | |
| 1712 } | |
| 1713 else | |
| 1714 retval = fh_nm; | |
| 4933 | 1715 } |
| 4343 | 1716 else |
| 4933 | 1717 error ("func2str: expecting valid function handle as first argument"); |
| 4343 | 1718 } |
| 1719 else | |
| 5823 | 1720 print_usage (); |
| 4343 | 1721 |
| 1722 return retval; | |
| 1723 } | |
| 1724 | |
| 4933 | 1725 DEFUN (str2func, args, , |
| 4343 | 1726 "-*- texinfo -*-\n\ |
| 4933 | 1727 @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
|
1728 @deftypefnx {Built-in Function} {} str2func (@var{fcn_name}, \"global\")\n\ |
| 4933 | 1729 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
|
1730 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
|
1731 are ignored in the lookup.\n\ |
| 4933 | 1732 @end deftypefn") |
| 4343 | 1733 { |
| 1734 octave_value retval; | |
|
9463
d34baf412786
support non-local function lookups in str2func
Jaroslav Hajek <highegg@gmail.com>
parents:
9458
diff
changeset
|
1735 int nargin = args.length (); |
| 4343 | 1736 |
|
9463
d34baf412786
support non-local function lookups in str2func
Jaroslav Hajek <highegg@gmail.com>
parents:
9458
diff
changeset
|
1737 if (nargin == 1 || nargin == 2) |
| 4343 | 1738 { |
| 4933 | 1739 std::string nm = args(0).string_value (); |
| 4343 | 1740 |
| 4933 | 1741 if (! error_state) |
|
9463
d34baf412786
support non-local function lookups in str2func
Jaroslav Hajek <highegg@gmail.com>
parents:
9458
diff
changeset
|
1742 retval = make_fcn_handle (nm, nargin != 2); |
| 4343 | 1743 else |
| 4933 | 1744 error ("str2func: expecting string as first argument"); |
| 4343 | 1745 } |
| 1746 else | |
| 5823 | 1747 print_usage (); |
| 4343 | 1748 |
| 1749 return retval; | |
| 1750 } | |
| 1751 | |
| 1752 /* | |
|
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
1753 %!function y = testrecursionfunc (f, x, n) |
|
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
1754 %! if (nargin < 3) |
|
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
1755 %! n = 0; |
|
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
1756 %! endif |
|
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
1757 %! if (n > 2) |
|
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
1758 %! y = f (x); |
|
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
1759 %! else |
|
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
1760 %! n++; |
|
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
1761 %! y = testrecursionfunc (@(x) f(2*x), x, n); |
|
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
1762 %! endif |
|
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
1763 %!test |
|
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
1764 %! assert (testrecursionfunc (@(x) x, 1), 8); |
|
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
1765 */ |
|
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
1766 |
|
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
1767 /* |
| 4343 | 1768 ;;; Local Variables: *** |
| 1769 ;;; mode: C++ *** | |
| 1770 ;;; End: *** | |
| 1771 */ |