Mercurial > jwe > octave
annotate libinterp/octave-value/ov-fcn-handle.h @ 26857:ab97008be411 jwe-anon-fcn
use m_ for member variables in function handle and inline function classes
* ov-fcn-handle.cc, ov-fcn-handle.h, ov-fcn-inline.cc,
ov-fcn-inline.h: Use "m_" prefix for member variable names in
octave_fcn_handle and octave_fcn_inline classes.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Wed, 06 Mar 2019 07:05:49 +0000 |
parents | 8bd9fd99c12a |
children | 9cd4b045fe3d |
rev | line source |
---|---|
4343 | 1 /* |
2 | |
26379
00f796120a6d
maint: Update copyright dates in all source files.
John W. Eaton <jwe@octave.org>
parents:
26122
diff
changeset
|
3 Copyright (C) 2003-2019 John W. Eaton |
10521
4d1fc073fbb7
add some missing copyright stmts
Jaroslav Hajek <highegg@gmail.com>
parents:
10324
diff
changeset
|
4 Copyright (C) 2009 VZLU Prague |
4343 | 5 |
6 This file is part of Octave. | |
7 | |
24534
194eb4bd202b
maint: Update punctuation for GPL v3 license text.
Rik <rik@octave.org>
parents:
24108
diff
changeset
|
8 Octave is free software: you can redistribute it and/or modify it |
22755
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22407
diff
changeset
|
9 under the terms of the GNU General Public License as published by |
24534
194eb4bd202b
maint: Update punctuation for GPL v3 license text.
Rik <rik@octave.org>
parents:
24108
diff
changeset
|
10 the Free Software Foundation, either version 3 of the License, or |
22755
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22407
diff
changeset
|
11 (at your option) any later version. |
4343 | 12 |
22755
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22407
diff
changeset
|
13 Octave is distributed in the hope that it will be useful, but |
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22407
diff
changeset
|
14 WITHOUT ANY WARRANTY; without even the implied warranty of |
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22407
diff
changeset
|
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22407
diff
changeset
|
16 GNU General Public License for more details. |
4343 | 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 |
24534
194eb4bd202b
maint: Update punctuation for GPL v3 license text.
Rik <rik@octave.org>
parents:
24108
diff
changeset
|
20 <https://www.gnu.org/licenses/>. |
4343 | 21 |
22 */ | |
23 | |
20791
f7084eae3318
maint: Use Octave coding conventions for #if statements.
Rik <rik@octave.org>
parents:
19863
diff
changeset
|
24 #if ! defined (octave_ov_fcn_handle_h) |
17822
ebb3ef964372
maint: Use common #define syntax "octave_filename_h" in h_files.
Rik <rik@octave.org>
parents:
17787
diff
changeset
|
25 #define octave_ov_fcn_handle_h 1 |
4343 | 26 |
21244
1473547f50f5
include octave-config.h in public header files
John W. Eaton <jwe@octave.org>
parents:
20791
diff
changeset
|
27 #include "octave-config.h" |
1473547f50f5
include octave-config.h in public header files
John W. Eaton <jwe@octave.org>
parents:
20791
diff
changeset
|
28 |
8950
d865363208d6
include <iosfwd> instead of <iostream> in header files
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
29 #include <iosfwd> |
26828
6e9034836239
allow handles to nested functions to work (bug #39257)
John W. Eaton <jwe@octave.org>
parents:
26697
diff
changeset
|
30 #include <list> |
4343 | 31 #include <string> |
32 | |
33 #include "ov-base.h" | |
34 #include "ov-fcn.h" | |
4654 | 35 #include "ov-typeinfo.h" |
26850
8bd9fd99c12a
lazily evaluate fcn handles; fix overload resolution (bug #29447, bug #31821, bug #48802)
John W. Eaton <jwe@octave.org>
parents:
26828
diff
changeset
|
36 #include "symscope.h" |
4343 | 37 |
23435
c452180ab672
begin refactoring parse tree evaluator
John W. Eaton <jwe@octave.org>
parents:
23433
diff
changeset
|
38 namespace octave |
c452180ab672
begin refactoring parse tree evaluator
John W. Eaton <jwe@octave.org>
parents:
23433
diff
changeset
|
39 { |
26696
1da1d9e60bf3
pass reference to interpreter to make_fcn_handle function
John W. Eaton <jwe@octave.org>
parents:
26401
diff
changeset
|
40 class interpreter; |
26828
6e9034836239
allow handles to nested functions to work (bug #39257)
John W. Eaton <jwe@octave.org>
parents:
26697
diff
changeset
|
41 class stack_frame; |
6e9034836239
allow handles to nested functions to work (bug #39257)
John W. Eaton <jwe@octave.org>
parents:
26697
diff
changeset
|
42 class tree_evaluator; |
23435
c452180ab672
begin refactoring parse tree evaluator
John W. Eaton <jwe@octave.org>
parents:
23433
diff
changeset
|
43 } |
c452180ab672
begin refactoring parse tree evaluator
John W. Eaton <jwe@octave.org>
parents:
23433
diff
changeset
|
44 |
4343 | 45 // Function handles. |
46 | |
4925 | 47 class |
7867
f6fffa74b9b5
Export additional symbols: octave_fcn_inline, octave_fcn_handle, read_binary_data, save_binary_data.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7761
diff
changeset
|
48 OCTINTERP_API |
4925 | 49 octave_fcn_handle : public octave_base_value |
4654 | 50 { |
9450
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
8950
diff
changeset
|
51 private: |
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
8950
diff
changeset
|
52 |
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
8950
diff
changeset
|
53 typedef std::map<std::string, octave_value> str_ov_map; |
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
8950
diff
changeset
|
54 |
4654 | 55 public: |
10261
a4fb4675accb
make printing of handles more Matlab-compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
10160
diff
changeset
|
56 |
a4fb4675accb
make printing of handles more Matlab-compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
10160
diff
changeset
|
57 static const std::string anonymous; |
a4fb4675accb
make printing of handles more Matlab-compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
10160
diff
changeset
|
58 |
4930 | 59 octave_fcn_handle (void) |
26857
ab97008be411
use m_ for member variables in function handle and inline function classes
John W. Eaton <jwe@octave.org>
parents:
26850
diff
changeset
|
60 : m_fcn (), m_name (), m_scope (), m_is_nested (false), |
26850
8bd9fd99c12a
lazily evaluate fcn handles; fix overload resolution (bug #29447, bug #31821, bug #48802)
John W. Eaton <jwe@octave.org>
parents:
26828
diff
changeset
|
61 m_closure_frames (nullptr) |
26828
6e9034836239
allow handles to nested functions to work (bug #39257)
John W. Eaton <jwe@octave.org>
parents:
26697
diff
changeset
|
62 { } |
5007 | 63 |
26850
8bd9fd99c12a
lazily evaluate fcn handles; fix overload resolution (bug #29447, bug #31821, bug #48802)
John W. Eaton <jwe@octave.org>
parents:
26828
diff
changeset
|
64 octave_fcn_handle (const octave::symbol_scope& scope, const std::string& n) |
26857
ab97008be411
use m_ for member variables in function handle and inline function classes
John W. Eaton <jwe@octave.org>
parents:
26850
diff
changeset
|
65 : m_fcn (), m_name (n), m_scope (scope), m_is_nested (false), |
26850
8bd9fd99c12a
lazily evaluate fcn handles; fix overload resolution (bug #29447, bug #31821, bug #48802)
John W. Eaton <jwe@octave.org>
parents:
26828
diff
changeset
|
66 m_closure_frames (nullptr) |
8bd9fd99c12a
lazily evaluate fcn handles; fix overload resolution (bug #29447, bug #31821, bug #48802)
John W. Eaton <jwe@octave.org>
parents:
26828
diff
changeset
|
67 { |
26857
ab97008be411
use m_ for member variables in function handle and inline function classes
John W. Eaton <jwe@octave.org>
parents:
26850
diff
changeset
|
68 if (! m_name.empty () && m_name[0] == '@') |
ab97008be411
use m_ for member variables in function handle and inline function classes
John W. Eaton <jwe@octave.org>
parents:
26850
diff
changeset
|
69 m_name = m_name.substr (1); |
26850
8bd9fd99c12a
lazily evaluate fcn handles; fix overload resolution (bug #29447, bug #31821, bug #48802)
John W. Eaton <jwe@octave.org>
parents:
26828
diff
changeset
|
70 } |
4654 | 71 |
26850
8bd9fd99c12a
lazily evaluate fcn handles; fix overload resolution (bug #29447, bug #31821, bug #48802)
John W. Eaton <jwe@octave.org>
parents:
26828
diff
changeset
|
72 octave_fcn_handle (const octave::symbol_scope& scope, |
8bd9fd99c12a
lazily evaluate fcn handles; fix overload resolution (bug #29447, bug #31821, bug #48802)
John W. Eaton <jwe@octave.org>
parents:
26828
diff
changeset
|
73 const octave_value& f, |
8bd9fd99c12a
lazily evaluate fcn handles; fix overload resolution (bug #29447, bug #31821, bug #48802)
John W. Eaton <jwe@octave.org>
parents:
26828
diff
changeset
|
74 const std::string& n = anonymous); |
10321
97b4bd6f0925
partially rewrite function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
10313
diff
changeset
|
75 |
26850
8bd9fd99c12a
lazily evaluate fcn handles; fix overload resolution (bug #29447, bug #31821, bug #48802)
John W. Eaton <jwe@octave.org>
parents:
26828
diff
changeset
|
76 octave_fcn_handle (const octave_value& f, |
8bd9fd99c12a
lazily evaluate fcn handles; fix overload resolution (bug #29447, bug #31821, bug #48802)
John W. Eaton <jwe@octave.org>
parents:
26828
diff
changeset
|
77 const std::string& n = anonymous); |
8bd9fd99c12a
lazily evaluate fcn handles; fix overload resolution (bug #29447, bug #31821, bug #48802)
John W. Eaton <jwe@octave.org>
parents:
26828
diff
changeset
|
78 |
8bd9fd99c12a
lazily evaluate fcn handles; fix overload resolution (bug #29447, bug #31821, bug #48802)
John W. Eaton <jwe@octave.org>
parents:
26828
diff
changeset
|
79 octave_fcn_handle (const octave_fcn_handle& fh) = default; |
4967 | 80 |
26828
6e9034836239
allow handles to nested functions to work (bug #39257)
John W. Eaton <jwe@octave.org>
parents:
26697
diff
changeset
|
81 ~octave_fcn_handle (void); |
4654 | 82 |
23446
cd4e1ee28716
maint: Use convention 'void * fcn ()' for functions which return pointers.
Rik <rik@octave.org>
parents:
23435
diff
changeset
|
83 octave_base_value * clone (void) const |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
84 { return new octave_fcn_handle (*this); } |
23446
cd4e1ee28716
maint: Use convention 'void * fcn ()' for functions which return pointers.
Rik <rik@octave.org>
parents:
23435
diff
changeset
|
85 octave_base_value * empty_clone (void) const |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
86 { return new octave_fcn_handle (); } |
4967 | 87 |
7651
443a8f5a50fd
require both subsref variants to be defined in octave_value subclasses
John W. Eaton <jwe@octave.org>
parents:
7336
diff
changeset
|
88 octave_value subsref (const std::string& type, |
10313 | 89 const std::list<octave_value_list>& idx) |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
90 { |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
91 octave_value_list tmp = subsref (type, idx, 1); |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
92 return tmp.length () > 0 ? tmp(0) : octave_value (); |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
93 } |
4924 | 94 |
95 octave_value_list subsref (const std::string& type, | |
10313 | 96 const std::list<octave_value_list>& idx, |
97 int nargout); | |
4924 | 98 |
4925 | 99 bool is_defined (void) const { return true; } |
4654 | 100 |
101 bool is_function_handle (void) const { return true; } | |
102 | |
26828
6e9034836239
allow handles to nested functions to work (bug #39257)
John W. Eaton <jwe@octave.org>
parents:
26697
diff
changeset
|
103 bool is_nested (void) const { return m_is_nested; } |
6e9034836239
allow handles to nested functions to work (bug #39257)
John W. Eaton <jwe@octave.org>
parents:
26697
diff
changeset
|
104 |
21573
f3f8e1d3e399
avoid mulitple definitions of static function-scope vars (bug #47372)
John W. Eaton <jwe@octave.org>
parents:
19863
diff
changeset
|
105 dim_vector dims (void) const; |
5654 | 106 |
26850
8bd9fd99c12a
lazily evaluate fcn handles; fix overload resolution (bug #29447, bug #31821, bug #48802)
John W. Eaton <jwe@octave.org>
parents:
26828
diff
changeset
|
107 // FIXME: These must go away. They don't do the right thing for |
8bd9fd99c12a
lazily evaluate fcn handles; fix overload resolution (bug #29447, bug #31821, bug #48802)
John W. Eaton <jwe@octave.org>
parents:
26828
diff
changeset
|
108 // scoping or overloads. |
8bd9fd99c12a
lazily evaluate fcn handles; fix overload resolution (bug #29447, bug #31821, bug #48802)
John W. Eaton <jwe@octave.org>
parents:
26828
diff
changeset
|
109 octave_function * function_value (bool = false); |
8bd9fd99c12a
lazily evaluate fcn handles; fix overload resolution (bug #29447, bug #31821, bug #48802)
John W. Eaton <jwe@octave.org>
parents:
26828
diff
changeset
|
110 octave_user_function * user_function_value (bool = false); |
6625 | 111 |
23446
cd4e1ee28716
maint: Use convention 'void * fcn ()' for functions which return pointers.
Rik <rik@octave.org>
parents:
23435
diff
changeset
|
112 octave_fcn_handle * fcn_handle_value (bool = false) { return this; } |
4654 | 113 |
26857
ab97008be411
use m_ for member variables in function handle and inline function classes
John W. Eaton <jwe@octave.org>
parents:
26850
diff
changeset
|
114 octave_value fcn_val (void) const { return m_fcn; } |
5007 | 115 |
26857
ab97008be411
use m_ for member variables in function handle and inline function classes
John W. Eaton <jwe@octave.org>
parents:
26850
diff
changeset
|
116 std::string fcn_name (void) const { return m_name; } |
4930 | 117 |
26828
6e9034836239
allow handles to nested functions to work (bug #39257)
John W. Eaton <jwe@octave.org>
parents:
26697
diff
changeset
|
118 void push_closure_context (octave::tree_evaluator& tw); |
6e9034836239
allow handles to nested functions to work (bug #39257)
John W. Eaton <jwe@octave.org>
parents:
26697
diff
changeset
|
119 |
6e9034836239
allow handles to nested functions to work (bug #39257)
John W. Eaton <jwe@octave.org>
parents:
26697
diff
changeset
|
120 octave_value workspace (void) const; |
6e9034836239
allow handles to nested functions to work (bug #39257)
John W. Eaton <jwe@octave.org>
parents:
26697
diff
changeset
|
121 |
10322
21551cc88061
improve function handles comparison
Jaroslav Hajek <highegg@gmail.com>
parents:
10321
diff
changeset
|
122 bool is_equal_to (const octave_fcn_handle&) const; |
21551cc88061
improve function handles comparison
Jaroslav Hajek <highegg@gmail.com>
parents:
10321
diff
changeset
|
123 |
25972
7eeb89b0d2d5
make char function work for function handles (bug #53118)
John W. Eaton <jwe@octave.org>
parents:
25383
diff
changeset
|
124 octave_value convert_to_str_internal (bool pad, bool force, char type) const; |
7eeb89b0d2d5
make char function work for function handles (bug #53118)
John W. Eaton <jwe@octave.org>
parents:
25383
diff
changeset
|
125 |
6974 | 126 bool save_ascii (std::ostream& os); |
4988 | 127 |
128 bool load_ascii (std::istream& is); | |
129 | |
26401
586413770c7f
pass save_as_floats by value in octave_value save_binary functions
John W. Eaton <jwe@octave.org>
parents:
26379
diff
changeset
|
130 bool save_binary (std::ostream& os, bool save_as_floats); |
4988 | 131 |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11584
diff
changeset
|
132 bool load_binary (std::istream& is, bool swap, |
21739
c4ab2e54f100
use namespace for oct_mach_info class
John W. Eaton <jwe@octave.org>
parents:
21574
diff
changeset
|
133 octave::mach_info::float_format fmt); |
4988 | 134 |
19863
09ed6f7538dd
avoid needing to include hdf5 in public header files (bug #44370, #43180)
John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org>
parents:
19697
diff
changeset
|
135 bool save_hdf5 (octave_hdf5_id loc_id, const char *name, bool save_as_floats); |
4988 | 136 |
19863
09ed6f7538dd
avoid needing to include hdf5 in public header files (bug #44370, #43180)
John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org>
parents:
19697
diff
changeset
|
137 bool load_hdf5 (octave_hdf5_id loc_id, const char *name); |
4988 | 138 |
18416
bcd71a2531d3
Support disp/display overloading in classdef
Michael Goffioul <michael.goffioul@gmail.com>
parents:
17822
diff
changeset
|
139 void print (std::ostream& os, bool pr_as_read_syntax = false); |
4654 | 140 |
141 void print_raw (std::ostream& os, bool pr_as_read_syntax = false) const; | |
142 | |
10324
7673850d6adf
make simple handles printed inline
Jaroslav Hajek <highegg@gmail.com>
parents:
10322
diff
changeset
|
143 // Simple function handles are printed without a newline. |
26857
ab97008be411
use m_ for member variables in function handle and inline function classes
John W. Eaton <jwe@octave.org>
parents:
26850
diff
changeset
|
144 bool print_as_scalar (void) const { return m_name != anonymous; } |
10324
7673850d6adf
make simple handles printed inline
Jaroslav Hajek <highegg@gmail.com>
parents:
10322
diff
changeset
|
145 |
4654 | 146 private: |
4343 | 147 |
23433
c9fab0bc983e
maint: Use convention 'int& x' for naming references.
Rik <rik@octave.org>
parents:
23220
diff
changeset
|
148 bool set_fcn (const std::string& octaveroot, const std::string& fpath); |
6625 | 149 |
4612 | 150 DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA |
4925 | 151 |
4933 | 152 protected: |
4930 | 153 |
26850
8bd9fd99c12a
lazily evaluate fcn handles; fix overload resolution (bug #29447, bug #31821, bug #48802)
John W. Eaton <jwe@octave.org>
parents:
26828
diff
changeset
|
154 // The function we are handling (this should be valid for handles to |
8bd9fd99c12a
lazily evaluate fcn handles; fix overload resolution (bug #29447, bug #31821, bug #48802)
John W. Eaton <jwe@octave.org>
parents:
26828
diff
changeset
|
155 // anonymous functions and some other special cases). Otherwise, we |
8bd9fd99c12a
lazily evaluate fcn handles; fix overload resolution (bug #29447, bug #31821, bug #48802)
John W. Eaton <jwe@octave.org>
parents:
26828
diff
changeset
|
156 // perform dynamic lookup based on the name of the function we are |
8bd9fd99c12a
lazily evaluate fcn handles; fix overload resolution (bug #29447, bug #31821, bug #48802)
John W. Eaton <jwe@octave.org>
parents:
26828
diff
changeset
|
157 // handling and the scope where the funtion handle object was created. |
26857
ab97008be411
use m_ for member variables in function handle and inline function classes
John W. Eaton <jwe@octave.org>
parents:
26850
diff
changeset
|
158 octave_value m_fcn; |
4925 | 159 |
26850
8bd9fd99c12a
lazily evaluate fcn handles; fix overload resolution (bug #29447, bug #31821, bug #48802)
John W. Eaton <jwe@octave.org>
parents:
26828
diff
changeset
|
160 // The function we would find without considering argument types. We |
8bd9fd99c12a
lazily evaluate fcn handles; fix overload resolution (bug #29447, bug #31821, bug #48802)
John W. Eaton <jwe@octave.org>
parents:
26828
diff
changeset
|
161 // cache this value so that the function_value and user_function_value |
8bd9fd99c12a
lazily evaluate fcn handles; fix overload resolution (bug #29447, bug #31821, bug #48802)
John W. Eaton <jwe@octave.org>
parents:
26828
diff
changeset
|
162 // methods may continue to work. |
8bd9fd99c12a
lazily evaluate fcn handles; fix overload resolution (bug #29447, bug #31821, bug #48802)
John W. Eaton <jwe@octave.org>
parents:
26828
diff
changeset
|
163 octave_value m_generic_fcn; |
8bd9fd99c12a
lazily evaluate fcn handles; fix overload resolution (bug #29447, bug #31821, bug #48802)
John W. Eaton <jwe@octave.org>
parents:
26828
diff
changeset
|
164 |
8bd9fd99c12a
lazily evaluate fcn handles; fix overload resolution (bug #29447, bug #31821, bug #48802)
John W. Eaton <jwe@octave.org>
parents:
26828
diff
changeset
|
165 // The name of the handle, not including the "@". |
26857
ab97008be411
use m_ for member variables in function handle and inline function classes
John W. Eaton <jwe@octave.org>
parents:
26850
diff
changeset
|
166 std::string m_name; |
9450
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
8950
diff
changeset
|
167 |
26850
8bd9fd99c12a
lazily evaluate fcn handles; fix overload resolution (bug #29447, bug #31821, bug #48802)
John W. Eaton <jwe@octave.org>
parents:
26828
diff
changeset
|
168 // The scope where this object was defined. |
8bd9fd99c12a
lazily evaluate fcn handles; fix overload resolution (bug #29447, bug #31821, bug #48802)
John W. Eaton <jwe@octave.org>
parents:
26828
diff
changeset
|
169 octave::symbol_scope m_scope; |
9450
cf714e75c656
implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents:
8950
diff
changeset
|
170 |
26828
6e9034836239
allow handles to nested functions to work (bug #39257)
John W. Eaton <jwe@octave.org>
parents:
26697
diff
changeset
|
171 // TRUE means this is a handle to a nested function. |
6e9034836239
allow handles to nested functions to work (bug #39257)
John W. Eaton <jwe@octave.org>
parents:
26697
diff
changeset
|
172 bool m_is_nested; |
6e9034836239
allow handles to nested functions to work (bug #39257)
John W. Eaton <jwe@octave.org>
parents:
26697
diff
changeset
|
173 |
6e9034836239
allow handles to nested functions to work (bug #39257)
John W. Eaton <jwe@octave.org>
parents:
26697
diff
changeset
|
174 // Saved stack frames for handles to nested functions. This allows us |
6e9034836239
allow handles to nested functions to work (bug #39257)
John W. Eaton <jwe@octave.org>
parents:
26697
diff
changeset
|
175 // to access non-locals and other context info when calling nested |
6e9034836239
allow handles to nested functions to work (bug #39257)
John W. Eaton <jwe@octave.org>
parents:
26697
diff
changeset
|
176 // functions indirectly through handles. |
6e9034836239
allow handles to nested functions to work (bug #39257)
John W. Eaton <jwe@octave.org>
parents:
26697
diff
changeset
|
177 std::list<octave::stack_frame *> *m_closure_frames; |
6e9034836239
allow handles to nested functions to work (bug #39257)
John W. Eaton <jwe@octave.org>
parents:
26697
diff
changeset
|
178 |
24108
1a53f0c855db
move some duplicate code into a separate function
John W. Eaton <jwe@octave.org>
parents:
23502
diff
changeset
|
179 bool parse_anon_fcn_handle (const std::string& fcn_text); |
1a53f0c855db
move some duplicate code into a separate function
John W. Eaton <jwe@octave.org>
parents:
23502
diff
changeset
|
180 |
23502
c6714ae1c06c
eliminate remaining do_multi_index_op methods
John W. Eaton <jwe@octave.org>
parents:
23481
diff
changeset
|
181 virtual octave_value_list call (int nargout, const octave_value_list& args); |
4343 | 182 }; |
183 | |
26696
1da1d9e60bf3
pass reference to interpreter to make_fcn_handle function
John W. Eaton <jwe@octave.org>
parents:
26401
diff
changeset
|
184 namespace octave |
1da1d9e60bf3
pass reference to interpreter to make_fcn_handle function
John W. Eaton <jwe@octave.org>
parents:
26401
diff
changeset
|
185 { |
1da1d9e60bf3
pass reference to interpreter to make_fcn_handle function
John W. Eaton <jwe@octave.org>
parents:
26401
diff
changeset
|
186 extern octave_value |
26857
ab97008be411
use m_ for member variables in function handle and inline function classes
John W. Eaton <jwe@octave.org>
parents:
26850
diff
changeset
|
187 make_fcn_handle (interpreter& interp, const std::string& name); |
26696
1da1d9e60bf3
pass reference to interpreter to make_fcn_handle function
John W. Eaton <jwe@octave.org>
parents:
26401
diff
changeset
|
188 } |
4343 | 189 |
190 #endif |