Mercurial > octave
annotate libinterp/corefcn/interpreter-private.cc @ 26864:041caa61ed34
use get_function_handle instead of extract_function
* cellfun.cc (Fcellfun, Farrayfun): Use get_function_handle instead of
extract_function.
* daspk.cc (daspk_fcn, daspk_jac): Now octave_value objects instead
of a pointers to octave_function objects. Change all uses.
(Fdaspk): Use get_function_handle instead of extract_function.
* dasrt.cc (dasrt_fcn, dasrt_jac, dasrt_cf): Now octave_value objects
instead of a pointers to octave_function objects. Change all uses.
(Fdasrt): Use get_function_handle instead of extract_function.
* dassl.cc (dassl_fcn, dassl_jac): Now octave_value objects instead
of a pointers to octave_function objects. Change all uses.
(Fdassl): Use get_function_handle instead of extract_function.
* lsode.cc (lsode_fcn, lsode_jac): Now octave_value objects instead
of a pointers to octave_function objects. Change all uses.
(Flsode): Use get_function_handle instead of extract_function.
* quad.cc (quad_fcn): Now an octave_value object instead of a pointer
to an octave_function object. Change all uses.
(Fquad): Use get_function_handle instead of extract_function.
New tests.
* quadcc.cc (fcn): Now an octave_value object instead of a pointer
to an octave_function object. Change all uses.
(Fquadcc): Use get_function_handle instead of extract_function.
* __eigs__.cc (eigs_fcn): Now an octave_value object instead of a pointer
to an octave_function object. Change all uses.
(F__eigs__): Use get_function_handle instead of extract_function.
New tests.
* interpreter-private.cc (get_function_handle): Don't scold users for
poor choices.
* variables.h (extract_function): Tag as deprecated.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Fri, 08 Mar 2019 06:24:34 +0000 |
parents | c589db954a4e |
children | 84ff9953faa1 |
rev | line source |
---|---|
23438 | 1 /* |
2 | |
26376
00f796120a6d
maint: Update copyright dates in all source files.
John W. Eaton <jwe@octave.org>
parents:
25994
diff
changeset
|
3 Copyright (C) 2017-2019 John W. Eaton |
23438 | 4 |
5 This file is part of Octave. | |
6 | |
24534
194eb4bd202b
maint: Update punctuation for GPL v3 license text.
Rik <rik@octave.org>
parents:
24361
diff
changeset
|
7 Octave is free software: you can redistribute it and/or modify it |
23438 | 8 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:
24361
diff
changeset
|
9 the Free Software Foundation, either version 3 of the License, or |
23438 | 10 (at your option) any later version. |
11 | |
12 Octave is distributed in the hope that it will be useful, but | |
13 WITHOUT ANY WARRANTY; without even the implied warranty of | |
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
15 GNU General Public License for more details. | |
16 | |
17 You should have received a copy of the GNU General Public License | |
18 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:
24361
diff
changeset
|
19 <https://www.gnu.org/licenses/>. |
23438 | 20 |
21 */ | |
22 | |
23 #if defined (HAVE_CONFIG_H) | |
24 # include "config.h" | |
25 #endif | |
26 | |
26863
c589db954a4e
new functions for getting a functicon from an octave_value object
John W. Eaton <jwe@octave.org>
parents:
26769
diff
changeset
|
27 #include <list> |
23438 | 28 #include <string> |
29 | |
24738
3695c2cd69b8
don't use singleton pattern for bp_table
John W. Eaton <jwe@octave.org>
parents:
24734
diff
changeset
|
30 #include "bp-table.h" |
23553
14723784b9f2
don't use singleton for call_stack
John W. Eaton <jwe@octave.org>
parents:
23532
diff
changeset
|
31 #include "call-stack.h" |
26769
2f847e3e8d6b
split classdef into multiple smaller source files
John W. Eaton <jwe@octave.org>
parents:
26376
diff
changeset
|
32 #include "cdef-manager.h" |
24734
5d8c4cbc56d7
don't use singleton pattern for child_list
John W. Eaton <jwe@octave.org>
parents:
24540
diff
changeset
|
33 #include "child-list.h" |
23438 | 34 #include "error.h" |
23774
41795b504a8b
don't use singleton for gtk_manager
John W. Eaton <jwe@octave.org>
parents:
23721
diff
changeset
|
35 #include "gtk-manager.h" |
23721
b2d55b52ee51
new class to manage help system and associated variables
John W. Eaton <jwe@octave.org>
parents:
23651
diff
changeset
|
36 #include "help.h" |
25407
ab10403a0b50
new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents:
25360
diff
changeset
|
37 #include "input.h" |
23438 | 38 #include "interpreter-private.h" |
23511
232c8d69d934
manage interpreter instance in interpreter object
John W. Eaton <jwe@octave.org>
parents:
23438
diff
changeset
|
39 #include "interpreter.h" |
23651
5c6cceef132b
don't use singleton for cdef_manager object
John W. Eaton <jwe@octave.org>
parents:
23627
diff
changeset
|
40 #include "load-path.h" |
25993
f75bb9d659e0
eliminate global and file-scope static variables from load-save.cc (bug #54571)
John W. Eaton <jwe@octave.org>
parents:
25460
diff
changeset
|
41 #include "load-save.h" |
25994
f881d3e271d2
eliminate global and file-scope static variables in oct-hist.cc
John W. Eaton <jwe@octave.org>
parents:
25993
diff
changeset
|
42 #include "oct-hist.h" |
26863
c589db954a4e
new functions for getting a functicon from an octave_value object
John W. Eaton <jwe@octave.org>
parents:
26769
diff
changeset
|
43 #include "ov.h" |
c589db954a4e
new functions for getting a functicon from an octave_value object
John W. Eaton <jwe@octave.org>
parents:
26769
diff
changeset
|
44 #include "ov-fcn-inline.h" |
25435
a52e6fb674b1
eliminate some singletons and static & global variables
John W. Eaton <jwe@octave.org>
parents:
25407
diff
changeset
|
45 #include "pager.h" |
23599
5cb3a2bb5e1e
don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents:
23553
diff
changeset
|
46 #include "symtab.h" |
23438 | 47 |
48 namespace octave | |
49 { | |
23517
1bc8f1f50b54
new function for accessing interpreter
John W. Eaton <jwe@octave.org>
parents:
23511
diff
changeset
|
50 interpreter& __get_interpreter__ (const std::string& who) |
23438 | 51 { |
23511
232c8d69d934
manage interpreter instance in interpreter object
John W. Eaton <jwe@octave.org>
parents:
23438
diff
changeset
|
52 interpreter *interp = interpreter::the_interpreter (); |
23438 | 53 |
54 if (! interp) | |
23599
5cb3a2bb5e1e
don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents:
23553
diff
changeset
|
55 { |
5cb3a2bb5e1e
don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents:
23553
diff
changeset
|
56 abort (); |
5cb3a2bb5e1e
don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents:
23553
diff
changeset
|
57 error ("%s: interpreter context missing", who.c_str ()); |
5cb3a2bb5e1e
don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents:
23553
diff
changeset
|
58 } |
23438 | 59 |
23517
1bc8f1f50b54
new function for accessing interpreter
John W. Eaton <jwe@octave.org>
parents:
23511
diff
changeset
|
60 return *interp; |
1bc8f1f50b54
new function for accessing interpreter
John W. Eaton <jwe@octave.org>
parents:
23511
diff
changeset
|
61 } |
1bc8f1f50b54
new function for accessing interpreter
John W. Eaton <jwe@octave.org>
parents:
23511
diff
changeset
|
62 |
23627
0a6e87804cab
don't use singleton pattern for dynamic_loader class
John W. Eaton <jwe@octave.org>
parents:
23609
diff
changeset
|
63 dynamic_loader& __get_dynamic_loader__ (const std::string& who) |
0a6e87804cab
don't use singleton pattern for dynamic_loader class
John W. Eaton <jwe@octave.org>
parents:
23609
diff
changeset
|
64 { |
0a6e87804cab
don't use singleton pattern for dynamic_loader class
John W. Eaton <jwe@octave.org>
parents:
23609
diff
changeset
|
65 interpreter& interp = __get_interpreter__ (who); |
0a6e87804cab
don't use singleton pattern for dynamic_loader class
John W. Eaton <jwe@octave.org>
parents:
23609
diff
changeset
|
66 |
0a6e87804cab
don't use singleton pattern for dynamic_loader class
John W. Eaton <jwe@octave.org>
parents:
23609
diff
changeset
|
67 return interp.get_dynamic_loader (); |
0a6e87804cab
don't use singleton pattern for dynamic_loader class
John W. Eaton <jwe@octave.org>
parents:
23609
diff
changeset
|
68 } |
0a6e87804cab
don't use singleton pattern for dynamic_loader class
John W. Eaton <jwe@octave.org>
parents:
23609
diff
changeset
|
69 |
23721
b2d55b52ee51
new class to manage help system and associated variables
John W. Eaton <jwe@octave.org>
parents:
23651
diff
changeset
|
70 help_system& __get_help_system__ (const std::string& who) |
b2d55b52ee51
new class to manage help system and associated variables
John W. Eaton <jwe@octave.org>
parents:
23651
diff
changeset
|
71 { |
b2d55b52ee51
new class to manage help system and associated variables
John W. Eaton <jwe@octave.org>
parents:
23651
diff
changeset
|
72 interpreter& interp = __get_interpreter__ (who); |
b2d55b52ee51
new class to manage help system and associated variables
John W. Eaton <jwe@octave.org>
parents:
23651
diff
changeset
|
73 |
b2d55b52ee51
new class to manage help system and associated variables
John W. Eaton <jwe@octave.org>
parents:
23651
diff
changeset
|
74 return interp.get_help_system (); |
b2d55b52ee51
new class to manage help system and associated variables
John W. Eaton <jwe@octave.org>
parents:
23651
diff
changeset
|
75 } |
b2d55b52ee51
new class to manage help system and associated variables
John W. Eaton <jwe@octave.org>
parents:
23651
diff
changeset
|
76 |
25994
f881d3e271d2
eliminate global and file-scope static variables in oct-hist.cc
John W. Eaton <jwe@octave.org>
parents:
25993
diff
changeset
|
77 history_system& __get_history_system__ (const std::string& who) |
f881d3e271d2
eliminate global and file-scope static variables in oct-hist.cc
John W. Eaton <jwe@octave.org>
parents:
25993
diff
changeset
|
78 { |
f881d3e271d2
eliminate global and file-scope static variables in oct-hist.cc
John W. Eaton <jwe@octave.org>
parents:
25993
diff
changeset
|
79 interpreter& interp = __get_interpreter__ (who); |
f881d3e271d2
eliminate global and file-scope static variables in oct-hist.cc
John W. Eaton <jwe@octave.org>
parents:
25993
diff
changeset
|
80 |
f881d3e271d2
eliminate global and file-scope static variables in oct-hist.cc
John W. Eaton <jwe@octave.org>
parents:
25993
diff
changeset
|
81 return interp.get_history_system (); |
f881d3e271d2
eliminate global and file-scope static variables in oct-hist.cc
John W. Eaton <jwe@octave.org>
parents:
25993
diff
changeset
|
82 } |
f881d3e271d2
eliminate global and file-scope static variables in oct-hist.cc
John W. Eaton <jwe@octave.org>
parents:
25993
diff
changeset
|
83 |
25407
ab10403a0b50
new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents:
25360
diff
changeset
|
84 input_system& __get_input_system__ (const std::string& who) |
ab10403a0b50
new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents:
25360
diff
changeset
|
85 { |
ab10403a0b50
new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents:
25360
diff
changeset
|
86 interpreter& interp = __get_interpreter__ (who); |
ab10403a0b50
new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents:
25360
diff
changeset
|
87 |
ab10403a0b50
new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents:
25360
diff
changeset
|
88 return interp.get_input_system (); |
ab10403a0b50
new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents:
25360
diff
changeset
|
89 } |
ab10403a0b50
new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents:
25360
diff
changeset
|
90 |
25435
a52e6fb674b1
eliminate some singletons and static & global variables
John W. Eaton <jwe@octave.org>
parents:
25407
diff
changeset
|
91 output_system& __get_output_system__ (const std::string& who) |
a52e6fb674b1
eliminate some singletons and static & global variables
John W. Eaton <jwe@octave.org>
parents:
25407
diff
changeset
|
92 { |
a52e6fb674b1
eliminate some singletons and static & global variables
John W. Eaton <jwe@octave.org>
parents:
25407
diff
changeset
|
93 interpreter& interp = __get_interpreter__ (who); |
a52e6fb674b1
eliminate some singletons and static & global variables
John W. Eaton <jwe@octave.org>
parents:
25407
diff
changeset
|
94 |
a52e6fb674b1
eliminate some singletons and static & global variables
John W. Eaton <jwe@octave.org>
parents:
25407
diff
changeset
|
95 return interp.get_output_system (); |
a52e6fb674b1
eliminate some singletons and static & global variables
John W. Eaton <jwe@octave.org>
parents:
25407
diff
changeset
|
96 } |
a52e6fb674b1
eliminate some singletons and static & global variables
John W. Eaton <jwe@octave.org>
parents:
25407
diff
changeset
|
97 |
23517
1bc8f1f50b54
new function for accessing interpreter
John W. Eaton <jwe@octave.org>
parents:
23511
diff
changeset
|
98 load_path& __get_load_path__ (const std::string& who) |
1bc8f1f50b54
new function for accessing interpreter
John W. Eaton <jwe@octave.org>
parents:
23511
diff
changeset
|
99 { |
1bc8f1f50b54
new function for accessing interpreter
John W. Eaton <jwe@octave.org>
parents:
23511
diff
changeset
|
100 interpreter& interp = __get_interpreter__ (who); |
1bc8f1f50b54
new function for accessing interpreter
John W. Eaton <jwe@octave.org>
parents:
23511
diff
changeset
|
101 |
1bc8f1f50b54
new function for accessing interpreter
John W. Eaton <jwe@octave.org>
parents:
23511
diff
changeset
|
102 return interp.get_load_path (); |
23438 | 103 } |
23532
084245f9bd03
pass reference to evaluator to octave_function call methods
John W. Eaton <jwe@octave.org>
parents:
23517
diff
changeset
|
104 |
25993
f75bb9d659e0
eliminate global and file-scope static variables from load-save.cc (bug #54571)
John W. Eaton <jwe@octave.org>
parents:
25460
diff
changeset
|
105 load_save_system& __get_load_save_system__ (const std::string& who) |
f75bb9d659e0
eliminate global and file-scope static variables from load-save.cc (bug #54571)
John W. Eaton <jwe@octave.org>
parents:
25460
diff
changeset
|
106 { |
f75bb9d659e0
eliminate global and file-scope static variables from load-save.cc (bug #54571)
John W. Eaton <jwe@octave.org>
parents:
25460
diff
changeset
|
107 interpreter& interp = __get_interpreter__ (who); |
f75bb9d659e0
eliminate global and file-scope static variables from load-save.cc (bug #54571)
John W. Eaton <jwe@octave.org>
parents:
25460
diff
changeset
|
108 |
f75bb9d659e0
eliminate global and file-scope static variables from load-save.cc (bug #54571)
John W. Eaton <jwe@octave.org>
parents:
25460
diff
changeset
|
109 return interp.get_load_save_system (); |
f75bb9d659e0
eliminate global and file-scope static variables from load-save.cc (bug #54571)
John W. Eaton <jwe@octave.org>
parents:
25460
diff
changeset
|
110 } |
f75bb9d659e0
eliminate global and file-scope static variables from load-save.cc (bug #54571)
John W. Eaton <jwe@octave.org>
parents:
25460
diff
changeset
|
111 |
24540
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
112 type_info& __get_type_info__ (const std::string& who) |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
113 { |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
114 interpreter& interp = __get_interpreter__ (who); |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
115 |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
116 return interp.get_type_info (); |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
117 } |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
118 |
23599
5cb3a2bb5e1e
don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents:
23553
diff
changeset
|
119 symbol_table& __get_symbol_table__ (const std::string& who) |
5cb3a2bb5e1e
don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents:
23553
diff
changeset
|
120 { |
5cb3a2bb5e1e
don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents:
23553
diff
changeset
|
121 interpreter& interp = __get_interpreter__ (who); |
5cb3a2bb5e1e
don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents:
23553
diff
changeset
|
122 |
5cb3a2bb5e1e
don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents:
23553
diff
changeset
|
123 return interp.get_symbol_table (); |
5cb3a2bb5e1e
don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents:
23553
diff
changeset
|
124 } |
5cb3a2bb5e1e
don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents:
23553
diff
changeset
|
125 |
24361
8bcfddad15ec
use shared_ptr to manage symbol_scope objects
John W. Eaton <jwe@octave.org>
parents:
24270
diff
changeset
|
126 symbol_scope __get_current_scope__ (const std::string& who) |
23599
5cb3a2bb5e1e
don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents:
23553
diff
changeset
|
127 { |
23609
99989ab8f142
new convenience functions for accessing current scope
John W. Eaton <jwe@octave.org>
parents:
23602
diff
changeset
|
128 interpreter& interp = __get_interpreter__ (who); |
99989ab8f142
new convenience functions for accessing current scope
John W. Eaton <jwe@octave.org>
parents:
23602
diff
changeset
|
129 |
99989ab8f142
new convenience functions for accessing current scope
John W. Eaton <jwe@octave.org>
parents:
23602
diff
changeset
|
130 return interp.get_current_scope (); |
99989ab8f142
new convenience functions for accessing current scope
John W. Eaton <jwe@octave.org>
parents:
23602
diff
changeset
|
131 } |
23599
5cb3a2bb5e1e
don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents:
23553
diff
changeset
|
132 |
24361
8bcfddad15ec
use shared_ptr to manage symbol_scope objects
John W. Eaton <jwe@octave.org>
parents:
24270
diff
changeset
|
133 symbol_scope __require_current_scope__ (const std::string& who) |
23609
99989ab8f142
new convenience functions for accessing current scope
John W. Eaton <jwe@octave.org>
parents:
23602
diff
changeset
|
134 { |
24361
8bcfddad15ec
use shared_ptr to manage symbol_scope objects
John W. Eaton <jwe@octave.org>
parents:
24270
diff
changeset
|
135 symbol_scope scope = __get_current_scope__ (who); |
23609
99989ab8f142
new convenience functions for accessing current scope
John W. Eaton <jwe@octave.org>
parents:
23602
diff
changeset
|
136 |
99989ab8f142
new convenience functions for accessing current scope
John W. Eaton <jwe@octave.org>
parents:
23602
diff
changeset
|
137 if (! scope) |
99989ab8f142
new convenience functions for accessing current scope
John W. Eaton <jwe@octave.org>
parents:
23602
diff
changeset
|
138 error ("%s: symbol table scope missing", who.c_str ()); |
99989ab8f142
new convenience functions for accessing current scope
John W. Eaton <jwe@octave.org>
parents:
23602
diff
changeset
|
139 |
99989ab8f142
new convenience functions for accessing current scope
John W. Eaton <jwe@octave.org>
parents:
23602
diff
changeset
|
140 return scope; |
23599
5cb3a2bb5e1e
don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents:
23553
diff
changeset
|
141 } |
5cb3a2bb5e1e
don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents:
23553
diff
changeset
|
142 |
23532
084245f9bd03
pass reference to evaluator to octave_function call methods
John W. Eaton <jwe@octave.org>
parents:
23517
diff
changeset
|
143 tree_evaluator& __get_evaluator__ (const std::string& who) |
084245f9bd03
pass reference to evaluator to octave_function call methods
John W. Eaton <jwe@octave.org>
parents:
23517
diff
changeset
|
144 { |
084245f9bd03
pass reference to evaluator to octave_function call methods
John W. Eaton <jwe@octave.org>
parents:
23517
diff
changeset
|
145 interpreter& interp = __get_interpreter__ (who); |
084245f9bd03
pass reference to evaluator to octave_function call methods
John W. Eaton <jwe@octave.org>
parents:
23517
diff
changeset
|
146 |
084245f9bd03
pass reference to evaluator to octave_function call methods
John W. Eaton <jwe@octave.org>
parents:
23517
diff
changeset
|
147 return interp.get_evaluator (); |
084245f9bd03
pass reference to evaluator to octave_function call methods
John W. Eaton <jwe@octave.org>
parents:
23517
diff
changeset
|
148 } |
23553
14723784b9f2
don't use singleton for call_stack
John W. Eaton <jwe@octave.org>
parents:
23532
diff
changeset
|
149 |
24738
3695c2cd69b8
don't use singleton pattern for bp_table
John W. Eaton <jwe@octave.org>
parents:
24734
diff
changeset
|
150 bp_table& __get_bp_table__ (const std::string& who) |
3695c2cd69b8
don't use singleton pattern for bp_table
John W. Eaton <jwe@octave.org>
parents:
24734
diff
changeset
|
151 { |
25360
bc5f225bc578
eliminate some global accesses to the breakpoint table
John W. Eaton <jwe@octave.org>
parents:
25054
diff
changeset
|
152 tree_evaluator& tw = __get_evaluator__ (who); |
24738
3695c2cd69b8
don't use singleton pattern for bp_table
John W. Eaton <jwe@octave.org>
parents:
24734
diff
changeset
|
153 |
25360
bc5f225bc578
eliminate some global accesses to the breakpoint table
John W. Eaton <jwe@octave.org>
parents:
25054
diff
changeset
|
154 return tw.get_bp_table (); |
24738
3695c2cd69b8
don't use singleton pattern for bp_table
John W. Eaton <jwe@octave.org>
parents:
24734
diff
changeset
|
155 } |
3695c2cd69b8
don't use singleton pattern for bp_table
John W. Eaton <jwe@octave.org>
parents:
24734
diff
changeset
|
156 |
23553
14723784b9f2
don't use singleton for call_stack
John W. Eaton <jwe@octave.org>
parents:
23532
diff
changeset
|
157 call_stack& __get_call_stack__ (const std::string& who) |
14723784b9f2
don't use singleton for call_stack
John W. Eaton <jwe@octave.org>
parents:
23532
diff
changeset
|
158 { |
14723784b9f2
don't use singleton for call_stack
John W. Eaton <jwe@octave.org>
parents:
23532
diff
changeset
|
159 interpreter& interp = __get_interpreter__ (who); |
14723784b9f2
don't use singleton for call_stack
John W. Eaton <jwe@octave.org>
parents:
23532
diff
changeset
|
160 |
14723784b9f2
don't use singleton for call_stack
John W. Eaton <jwe@octave.org>
parents:
23532
diff
changeset
|
161 return interp.get_call_stack (); |
14723784b9f2
don't use singleton for call_stack
John W. Eaton <jwe@octave.org>
parents:
23532
diff
changeset
|
162 } |
23651
5c6cceef132b
don't use singleton for cdef_manager object
John W. Eaton <jwe@octave.org>
parents:
23627
diff
changeset
|
163 |
24734
5d8c4cbc56d7
don't use singleton pattern for child_list
John W. Eaton <jwe@octave.org>
parents:
24540
diff
changeset
|
164 child_list& __get_child_list__ (const std::string& who) |
5d8c4cbc56d7
don't use singleton pattern for child_list
John W. Eaton <jwe@octave.org>
parents:
24540
diff
changeset
|
165 { |
5d8c4cbc56d7
don't use singleton pattern for child_list
John W. Eaton <jwe@octave.org>
parents:
24540
diff
changeset
|
166 interpreter& interp = __get_interpreter__ (who); |
5d8c4cbc56d7
don't use singleton pattern for child_list
John W. Eaton <jwe@octave.org>
parents:
24540
diff
changeset
|
167 |
5d8c4cbc56d7
don't use singleton pattern for child_list
John W. Eaton <jwe@octave.org>
parents:
24540
diff
changeset
|
168 return interp.get_child_list (); |
5d8c4cbc56d7
don't use singleton pattern for child_list
John W. Eaton <jwe@octave.org>
parents:
24540
diff
changeset
|
169 } |
5d8c4cbc56d7
don't use singleton pattern for child_list
John W. Eaton <jwe@octave.org>
parents:
24540
diff
changeset
|
170 |
23651
5c6cceef132b
don't use singleton for cdef_manager object
John W. Eaton <jwe@octave.org>
parents:
23627
diff
changeset
|
171 cdef_manager& __get_cdef_manager__ (const std::string& who) |
5c6cceef132b
don't use singleton for cdef_manager object
John W. Eaton <jwe@octave.org>
parents:
23627
diff
changeset
|
172 { |
5c6cceef132b
don't use singleton for cdef_manager object
John W. Eaton <jwe@octave.org>
parents:
23627
diff
changeset
|
173 interpreter& interp = __get_interpreter__ (who); |
5c6cceef132b
don't use singleton for cdef_manager object
John W. Eaton <jwe@octave.org>
parents:
23627
diff
changeset
|
174 |
5c6cceef132b
don't use singleton for cdef_manager object
John W. Eaton <jwe@octave.org>
parents:
23627
diff
changeset
|
175 return interp.get_cdef_manager (); |
5c6cceef132b
don't use singleton for cdef_manager object
John W. Eaton <jwe@octave.org>
parents:
23627
diff
changeset
|
176 } |
23774
41795b504a8b
don't use singleton for gtk_manager
John W. Eaton <jwe@octave.org>
parents:
23721
diff
changeset
|
177 |
41795b504a8b
don't use singleton for gtk_manager
John W. Eaton <jwe@octave.org>
parents:
23721
diff
changeset
|
178 gtk_manager& __get_gtk_manager__ (const std::string& who) |
41795b504a8b
don't use singleton for gtk_manager
John W. Eaton <jwe@octave.org>
parents:
23721
diff
changeset
|
179 { |
41795b504a8b
don't use singleton for gtk_manager
John W. Eaton <jwe@octave.org>
parents:
23721
diff
changeset
|
180 interpreter& interp = __get_interpreter__ (who); |
41795b504a8b
don't use singleton for gtk_manager
John W. Eaton <jwe@octave.org>
parents:
23721
diff
changeset
|
181 |
41795b504a8b
don't use singleton for gtk_manager
John W. Eaton <jwe@octave.org>
parents:
23721
diff
changeset
|
182 return interp.get_gtk_manager (); |
41795b504a8b
don't use singleton for gtk_manager
John W. Eaton <jwe@octave.org>
parents:
23721
diff
changeset
|
183 } |
26863
c589db954a4e
new functions for getting a functicon from an octave_value object
John W. Eaton <jwe@octave.org>
parents:
26769
diff
changeset
|
184 |
c589db954a4e
new functions for getting a functicon from an octave_value object
John W. Eaton <jwe@octave.org>
parents:
26769
diff
changeset
|
185 octave_value |
c589db954a4e
new functions for getting a functicon from an octave_value object
John W. Eaton <jwe@octave.org>
parents:
26769
diff
changeset
|
186 get_function_handle (octave::interpreter& interp, const octave_value& arg, |
c589db954a4e
new functions for getting a functicon from an octave_value object
John W. Eaton <jwe@octave.org>
parents:
26769
diff
changeset
|
187 const std::string& parameter_name) |
c589db954a4e
new functions for getting a functicon from an octave_value object
John W. Eaton <jwe@octave.org>
parents:
26769
diff
changeset
|
188 { |
c589db954a4e
new functions for getting a functicon from an octave_value object
John W. Eaton <jwe@octave.org>
parents:
26769
diff
changeset
|
189 std::list<std::string> parameter_names; |
c589db954a4e
new functions for getting a functicon from an octave_value object
John W. Eaton <jwe@octave.org>
parents:
26769
diff
changeset
|
190 parameter_names.push_back (parameter_name); |
c589db954a4e
new functions for getting a functicon from an octave_value object
John W. Eaton <jwe@octave.org>
parents:
26769
diff
changeset
|
191 return get_function_handle (interp, arg, parameter_names); |
c589db954a4e
new functions for getting a functicon from an octave_value object
John W. Eaton <jwe@octave.org>
parents:
26769
diff
changeset
|
192 } |
c589db954a4e
new functions for getting a functicon from an octave_value object
John W. Eaton <jwe@octave.org>
parents:
26769
diff
changeset
|
193 |
c589db954a4e
new functions for getting a functicon from an octave_value object
John W. Eaton <jwe@octave.org>
parents:
26769
diff
changeset
|
194 octave_value |
c589db954a4e
new functions for getting a functicon from an octave_value object
John W. Eaton <jwe@octave.org>
parents:
26769
diff
changeset
|
195 get_function_handle (octave::interpreter& interp, const octave_value& arg, |
c589db954a4e
new functions for getting a functicon from an octave_value object
John W. Eaton <jwe@octave.org>
parents:
26769
diff
changeset
|
196 const std::list<std::string>& parameter_names) |
c589db954a4e
new functions for getting a functicon from an octave_value object
John W. Eaton <jwe@octave.org>
parents:
26769
diff
changeset
|
197 { |
c589db954a4e
new functions for getting a functicon from an octave_value object
John W. Eaton <jwe@octave.org>
parents:
26769
diff
changeset
|
198 if (arg.is_function_handle () || arg.is_inline_function ()) |
c589db954a4e
new functions for getting a functicon from an octave_value object
John W. Eaton <jwe@octave.org>
parents:
26769
diff
changeset
|
199 return arg; |
c589db954a4e
new functions for getting a functicon from an octave_value object
John W. Eaton <jwe@octave.org>
parents:
26769
diff
changeset
|
200 else if (arg.is_string ()) |
c589db954a4e
new functions for getting a functicon from an octave_value object
John W. Eaton <jwe@octave.org>
parents:
26769
diff
changeset
|
201 { |
c589db954a4e
new functions for getting a functicon from an octave_value object
John W. Eaton <jwe@octave.org>
parents:
26769
diff
changeset
|
202 std::string fstr = arg.string_value (); |
c589db954a4e
new functions for getting a functicon from an octave_value object
John W. Eaton <jwe@octave.org>
parents:
26769
diff
changeset
|
203 |
c589db954a4e
new functions for getting a functicon from an octave_value object
John W. Eaton <jwe@octave.org>
parents:
26769
diff
changeset
|
204 if (fstr.empty ()) |
c589db954a4e
new functions for getting a functicon from an octave_value object
John W. Eaton <jwe@octave.org>
parents:
26769
diff
changeset
|
205 return octave_value (); |
c589db954a4e
new functions for getting a functicon from an octave_value object
John W. Eaton <jwe@octave.org>
parents:
26769
diff
changeset
|
206 |
c589db954a4e
new functions for getting a functicon from an octave_value object
John W. Eaton <jwe@octave.org>
parents:
26769
diff
changeset
|
207 octave::symbol_table& symtab = interp.get_symbol_table (); |
c589db954a4e
new functions for getting a functicon from an octave_value object
John W. Eaton <jwe@octave.org>
parents:
26769
diff
changeset
|
208 |
c589db954a4e
new functions for getting a functicon from an octave_value object
John W. Eaton <jwe@octave.org>
parents:
26769
diff
changeset
|
209 octave_value fcn = symtab.find_function (fstr); |
c589db954a4e
new functions for getting a functicon from an octave_value object
John W. Eaton <jwe@octave.org>
parents:
26769
diff
changeset
|
210 |
c589db954a4e
new functions for getting a functicon from an octave_value object
John W. Eaton <jwe@octave.org>
parents:
26769
diff
changeset
|
211 if (fcn.is_defined ()) |
c589db954a4e
new functions for getting a functicon from an octave_value object
John W. Eaton <jwe@octave.org>
parents:
26769
diff
changeset
|
212 return fcn; |
c589db954a4e
new functions for getting a functicon from an octave_value object
John W. Eaton <jwe@octave.org>
parents:
26769
diff
changeset
|
213 |
c589db954a4e
new functions for getting a functicon from an octave_value object
John W. Eaton <jwe@octave.org>
parents:
26769
diff
changeset
|
214 fcn = octave_value (new octave_fcn_inline (fstr, parameter_names)); |
c589db954a4e
new functions for getting a functicon from an octave_value object
John W. Eaton <jwe@octave.org>
parents:
26769
diff
changeset
|
215 |
26864
041caa61ed34
use get_function_handle instead of extract_function
John W. Eaton <jwe@octave.org>
parents:
26863
diff
changeset
|
216 // Possibly warn here that passing the function body in a |
041caa61ed34
use get_function_handle instead of extract_function
John W. Eaton <jwe@octave.org>
parents:
26863
diff
changeset
|
217 // character string is discouraged. |
26863
c589db954a4e
new functions for getting a functicon from an octave_value object
John W. Eaton <jwe@octave.org>
parents:
26769
diff
changeset
|
218 |
c589db954a4e
new functions for getting a functicon from an octave_value object
John W. Eaton <jwe@octave.org>
parents:
26769
diff
changeset
|
219 return fcn; |
c589db954a4e
new functions for getting a functicon from an octave_value object
John W. Eaton <jwe@octave.org>
parents:
26769
diff
changeset
|
220 } |
c589db954a4e
new functions for getting a functicon from an octave_value object
John W. Eaton <jwe@octave.org>
parents:
26769
diff
changeset
|
221 |
c589db954a4e
new functions for getting a functicon from an octave_value object
John W. Eaton <jwe@octave.org>
parents:
26769
diff
changeset
|
222 return octave_value (); |
c589db954a4e
new functions for getting a functicon from an octave_value object
John W. Eaton <jwe@octave.org>
parents:
26769
diff
changeset
|
223 } |
23438 | 224 } |