Mercurial > octave
annotate libinterp/corefcn/interpreter-private.cc @ 27321:eddce82a57cc
don't use singleton pattern for gh_manager object
* interpreter.h, interpreter.cc (interpreter::m_gh_manager):
New data member.
(interpreter::interpreter): Initialize it.
(interpreter::get_gh_manager): New function.
* interpreter-private.h, interpreter-private.cc (__get_gh_manager__):
New function.
* graphics.in.h, graphics.cc (gh_manager::instance): Delete.
(gh_manager::m_interpreter): New data member.
(gh_manager::gh_manager): Accept reference to interpreter as
argument. Make public.
(gh_manager::create_instance): Delete.
(gh_manager& gh_manager::instance): New member function. Replace
direct uses of previous global instance variable with this function to
access gh_manager from interpreter object.
(gh_manager::instance_ok): Delete. Change all uses to assume that the
gh_manager instance is always present.
(gh_manager::cleanup_instance): Delete.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Mon, 05 Aug 2019 10:42:18 -0500 |
parents | 596312d4f25d |
children | 5e0f6db9428f |
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" |
26769
2f847e3e8d6b
split classdef into multiple smaller source files
John W. Eaton <jwe@octave.org>
parents:
26376
diff
changeset
|
31 #include "cdef-manager.h" |
24734
5d8c4cbc56d7
don't use singleton pattern for child_list
John W. Eaton <jwe@octave.org>
parents:
24540
diff
changeset
|
32 #include "child-list.h" |
27266
596312d4f25d
don't use singleton pattern for display_info class
John W. Eaton <jwe@octave.org>
parents:
27263
diff
changeset
|
33 #include "display.h" |
23438 | 34 #include "error.h" |
27263
99aa1bcb8848
rename octave_link and octave_link_events classes, move inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
27261
diff
changeset
|
35 #include "event-manager.h" |
23774
41795b504a8b
don't use singleton for gtk_manager
John W. Eaton <jwe@octave.org>
parents:
23721
diff
changeset
|
36 #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
|
37 #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
|
38 #include "input.h" |
23438 | 39 #include "interpreter-private.h" |
23511
232c8d69d934
manage interpreter instance in interpreter object
John W. Eaton <jwe@octave.org>
parents:
23438
diff
changeset
|
40 #include "interpreter.h" |
23651
5c6cceef132b
don't use singleton for cdef_manager object
John W. Eaton <jwe@octave.org>
parents:
23627
diff
changeset
|
41 #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
|
42 #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
|
43 #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
|
44 #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
|
45 #include "ov-fcn-inline.h" |
25435
a52e6fb674b1
eliminate some singletons and static & global variables
John W. Eaton <jwe@octave.org>
parents:
25407
diff
changeset
|
46 #include "pager.h" |
23599
5cb3a2bb5e1e
don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents:
23553
diff
changeset
|
47 #include "symtab.h" |
23438 | 48 |
49 namespace octave | |
50 { | |
23517
1bc8f1f50b54
new function for accessing interpreter
John W. Eaton <jwe@octave.org>
parents:
23511
diff
changeset
|
51 interpreter& __get_interpreter__ (const std::string& who) |
23438 | 52 { |
23511
232c8d69d934
manage interpreter instance in interpreter object
John W. Eaton <jwe@octave.org>
parents:
23438
diff
changeset
|
53 interpreter *interp = interpreter::the_interpreter (); |
23438 | 54 |
55 if (! interp) | |
23599
5cb3a2bb5e1e
don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents:
23553
diff
changeset
|
56 { |
5cb3a2bb5e1e
don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents:
23553
diff
changeset
|
57 abort (); |
5cb3a2bb5e1e
don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents:
23553
diff
changeset
|
58 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
|
59 } |
23438 | 60 |
23517
1bc8f1f50b54
new function for accessing interpreter
John W. Eaton <jwe@octave.org>
parents:
23511
diff
changeset
|
61 return *interp; |
1bc8f1f50b54
new function for accessing interpreter
John W. Eaton <jwe@octave.org>
parents:
23511
diff
changeset
|
62 } |
1bc8f1f50b54
new function for accessing interpreter
John W. Eaton <jwe@octave.org>
parents:
23511
diff
changeset
|
63 |
23627
0a6e87804cab
don't use singleton pattern for dynamic_loader class
John W. Eaton <jwe@octave.org>
parents:
23609
diff
changeset
|
64 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
|
65 { |
0a6e87804cab
don't use singleton pattern for dynamic_loader class
John W. Eaton <jwe@octave.org>
parents:
23609
diff
changeset
|
66 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
|
67 |
0a6e87804cab
don't use singleton pattern for dynamic_loader class
John W. Eaton <jwe@octave.org>
parents:
23609
diff
changeset
|
68 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
|
69 } |
0a6e87804cab
don't use singleton pattern for dynamic_loader class
John W. Eaton <jwe@octave.org>
parents:
23609
diff
changeset
|
70 |
27160
6b0c61a5a0f0
move global error configuration and status variables inside a class
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
71 error_system& __get_error_system__ (const std::string& who) |
6b0c61a5a0f0
move global error configuration and status variables inside a class
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
72 { |
6b0c61a5a0f0
move global error configuration and status variables inside a class
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
73 interpreter& interp = __get_interpreter__ (who); |
6b0c61a5a0f0
move global error configuration and status variables inside a class
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
74 |
6b0c61a5a0f0
move global error configuration and status variables inside a class
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
75 return interp.get_error_system (); |
6b0c61a5a0f0
move global error configuration and status variables inside a class
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
76 } |
6b0c61a5a0f0
move global error configuration and status variables inside a class
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
77 |
27321
eddce82a57cc
don't use singleton pattern for gh_manager object
John W. Eaton <jwe@octave.org>
parents:
27266
diff
changeset
|
78 gh_manager& __get_gh_manager__ (const std::string& who) |
eddce82a57cc
don't use singleton pattern for gh_manager object
John W. Eaton <jwe@octave.org>
parents:
27266
diff
changeset
|
79 { |
eddce82a57cc
don't use singleton pattern for gh_manager object
John W. Eaton <jwe@octave.org>
parents:
27266
diff
changeset
|
80 interpreter& interp = __get_interpreter__ (who); |
eddce82a57cc
don't use singleton pattern for gh_manager object
John W. Eaton <jwe@octave.org>
parents:
27266
diff
changeset
|
81 |
eddce82a57cc
don't use singleton pattern for gh_manager object
John W. Eaton <jwe@octave.org>
parents:
27266
diff
changeset
|
82 return interp.get_gh_manager (); |
eddce82a57cc
don't use singleton pattern for gh_manager object
John W. Eaton <jwe@octave.org>
parents:
27266
diff
changeset
|
83 } |
eddce82a57cc
don't use singleton pattern for gh_manager object
John W. Eaton <jwe@octave.org>
parents:
27266
diff
changeset
|
84 |
23721
b2d55b52ee51
new class to manage help system and associated variables
John W. Eaton <jwe@octave.org>
parents:
23651
diff
changeset
|
85 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
|
86 { |
b2d55b52ee51
new class to manage help system and associated variables
John W. Eaton <jwe@octave.org>
parents:
23651
diff
changeset
|
87 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
|
88 |
b2d55b52ee51
new class to manage help system and associated variables
John W. Eaton <jwe@octave.org>
parents:
23651
diff
changeset
|
89 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
|
90 } |
b2d55b52ee51
new class to manage help system and associated variables
John W. Eaton <jwe@octave.org>
parents:
23651
diff
changeset
|
91 |
25994
f881d3e271d2
eliminate global and file-scope static variables in oct-hist.cc
John W. Eaton <jwe@octave.org>
parents:
25993
diff
changeset
|
92 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
|
93 { |
f881d3e271d2
eliminate global and file-scope static variables in oct-hist.cc
John W. Eaton <jwe@octave.org>
parents:
25993
diff
changeset
|
94 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
|
95 |
f881d3e271d2
eliminate global and file-scope static variables in oct-hist.cc
John W. Eaton <jwe@octave.org>
parents:
25993
diff
changeset
|
96 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
|
97 } |
f881d3e271d2
eliminate global and file-scope static variables in oct-hist.cc
John W. Eaton <jwe@octave.org>
parents:
25993
diff
changeset
|
98 |
25407
ab10403a0b50
new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents:
25360
diff
changeset
|
99 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
|
100 { |
ab10403a0b50
new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents:
25360
diff
changeset
|
101 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
|
102 |
ab10403a0b50
new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents:
25360
diff
changeset
|
103 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
|
104 } |
ab10403a0b50
new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents:
25360
diff
changeset
|
105 |
25435
a52e6fb674b1
eliminate some singletons and static & global variables
John W. Eaton <jwe@octave.org>
parents:
25407
diff
changeset
|
106 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
|
107 { |
a52e6fb674b1
eliminate some singletons and static & global variables
John W. Eaton <jwe@octave.org>
parents:
25407
diff
changeset
|
108 interpreter& interp = __get_interpreter__ (who); |
a52e6fb674b1
eliminate some singletons and static & global variables
John W. Eaton <jwe@octave.org>
parents:
25407
diff
changeset
|
109 |
a52e6fb674b1
eliminate some singletons and static & global variables
John W. Eaton <jwe@octave.org>
parents:
25407
diff
changeset
|
110 return interp.get_output_system (); |
a52e6fb674b1
eliminate some singletons and static & global variables
John W. Eaton <jwe@octave.org>
parents:
25407
diff
changeset
|
111 } |
a52e6fb674b1
eliminate some singletons and static & global variables
John W. Eaton <jwe@octave.org>
parents:
25407
diff
changeset
|
112 |
23517
1bc8f1f50b54
new function for accessing interpreter
John W. Eaton <jwe@octave.org>
parents:
23511
diff
changeset
|
113 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
|
114 { |
1bc8f1f50b54
new function for accessing interpreter
John W. Eaton <jwe@octave.org>
parents:
23511
diff
changeset
|
115 interpreter& interp = __get_interpreter__ (who); |
1bc8f1f50b54
new function for accessing interpreter
John W. Eaton <jwe@octave.org>
parents:
23511
diff
changeset
|
116 |
1bc8f1f50b54
new function for accessing interpreter
John W. Eaton <jwe@octave.org>
parents:
23511
diff
changeset
|
117 return interp.get_load_path (); |
23438 | 118 } |
23532
084245f9bd03
pass reference to evaluator to octave_function call methods
John W. Eaton <jwe@octave.org>
parents:
23517
diff
changeset
|
119 |
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
|
120 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
|
121 { |
f75bb9d659e0
eliminate global and file-scope static variables from load-save.cc (bug #54571)
John W. Eaton <jwe@octave.org>
parents:
25460
diff
changeset
|
122 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
|
123 |
f75bb9d659e0
eliminate global and file-scope static variables from load-save.cc (bug #54571)
John W. Eaton <jwe@octave.org>
parents:
25460
diff
changeset
|
124 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
|
125 } |
f75bb9d659e0
eliminate global and file-scope static variables from load-save.cc (bug #54571)
John W. Eaton <jwe@octave.org>
parents:
25460
diff
changeset
|
126 |
27263
99aa1bcb8848
rename octave_link and octave_link_events classes, move inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
27261
diff
changeset
|
127 event_manager& __get_event_manager__ (const std::string& who) |
27261
dccdc3b001a2
eliminate static functions from octave_link class
John W. Eaton <jwe@octave.org>
parents:
27213
diff
changeset
|
128 { |
dccdc3b001a2
eliminate static functions from octave_link class
John W. Eaton <jwe@octave.org>
parents:
27213
diff
changeset
|
129 interpreter& interp = __get_interpreter__ (who); |
dccdc3b001a2
eliminate static functions from octave_link class
John W. Eaton <jwe@octave.org>
parents:
27213
diff
changeset
|
130 |
27263
99aa1bcb8848
rename octave_link and octave_link_events classes, move inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
27261
diff
changeset
|
131 return interp.get_event_manager (); |
27261
dccdc3b001a2
eliminate static functions from octave_link class
John W. Eaton <jwe@octave.org>
parents:
27213
diff
changeset
|
132 } |
dccdc3b001a2
eliminate static functions from octave_link class
John W. Eaton <jwe@octave.org>
parents:
27213
diff
changeset
|
133 |
24540
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
134 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
|
135 { |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
136 interpreter& interp = __get_interpreter__ (who); |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
137 |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
138 return interp.get_type_info (); |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
139 } |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
140 |
23599
5cb3a2bb5e1e
don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents:
23553
diff
changeset
|
141 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
|
142 { |
5cb3a2bb5e1e
don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents:
23553
diff
changeset
|
143 interpreter& interp = __get_interpreter__ (who); |
5cb3a2bb5e1e
don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents:
23553
diff
changeset
|
144 |
5cb3a2bb5e1e
don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents:
23553
diff
changeset
|
145 return interp.get_symbol_table (); |
5cb3a2bb5e1e
don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents:
23553
diff
changeset
|
146 } |
5cb3a2bb5e1e
don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents:
23553
diff
changeset
|
147 |
24361
8bcfddad15ec
use shared_ptr to manage symbol_scope objects
John W. Eaton <jwe@octave.org>
parents:
24270
diff
changeset
|
148 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
|
149 { |
23609
99989ab8f142
new convenience functions for accessing current scope
John W. Eaton <jwe@octave.org>
parents:
23602
diff
changeset
|
150 interpreter& interp = __get_interpreter__ (who); |
99989ab8f142
new convenience functions for accessing current scope
John W. Eaton <jwe@octave.org>
parents:
23602
diff
changeset
|
151 |
99989ab8f142
new convenience functions for accessing current scope
John W. Eaton <jwe@octave.org>
parents:
23602
diff
changeset
|
152 return interp.get_current_scope (); |
99989ab8f142
new convenience functions for accessing current scope
John W. Eaton <jwe@octave.org>
parents:
23602
diff
changeset
|
153 } |
23599
5cb3a2bb5e1e
don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents:
23553
diff
changeset
|
154 |
24361
8bcfddad15ec
use shared_ptr to manage symbol_scope objects
John W. Eaton <jwe@octave.org>
parents:
24270
diff
changeset
|
155 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
|
156 { |
24361
8bcfddad15ec
use shared_ptr to manage symbol_scope objects
John W. Eaton <jwe@octave.org>
parents:
24270
diff
changeset
|
157 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
|
158 |
99989ab8f142
new convenience functions for accessing current scope
John W. Eaton <jwe@octave.org>
parents:
23602
diff
changeset
|
159 if (! scope) |
99989ab8f142
new convenience functions for accessing current scope
John W. Eaton <jwe@octave.org>
parents:
23602
diff
changeset
|
160 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
|
161 |
99989ab8f142
new convenience functions for accessing current scope
John W. Eaton <jwe@octave.org>
parents:
23602
diff
changeset
|
162 return scope; |
23599
5cb3a2bb5e1e
don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents:
23553
diff
changeset
|
163 } |
5cb3a2bb5e1e
don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents:
23553
diff
changeset
|
164 |
23532
084245f9bd03
pass reference to evaluator to octave_function call methods
John W. Eaton <jwe@octave.org>
parents:
23517
diff
changeset
|
165 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
|
166 { |
084245f9bd03
pass reference to evaluator to octave_function call methods
John W. Eaton <jwe@octave.org>
parents:
23517
diff
changeset
|
167 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
|
168 |
084245f9bd03
pass reference to evaluator to octave_function call methods
John W. Eaton <jwe@octave.org>
parents:
23517
diff
changeset
|
169 return interp.get_evaluator (); |
084245f9bd03
pass reference to evaluator to octave_function call methods
John W. Eaton <jwe@octave.org>
parents:
23517
diff
changeset
|
170 } |
23553
14723784b9f2
don't use singleton for call_stack
John W. Eaton <jwe@octave.org>
parents:
23532
diff
changeset
|
171 |
24738
3695c2cd69b8
don't use singleton pattern for bp_table
John W. Eaton <jwe@octave.org>
parents:
24734
diff
changeset
|
172 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
|
173 { |
25360
bc5f225bc578
eliminate some global accesses to the breakpoint table
John W. Eaton <jwe@octave.org>
parents:
25054
diff
changeset
|
174 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
|
175 |
25360
bc5f225bc578
eliminate some global accesses to the breakpoint table
John W. Eaton <jwe@octave.org>
parents:
25054
diff
changeset
|
176 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
|
177 } |
3695c2cd69b8
don't use singleton pattern for bp_table
John W. Eaton <jwe@octave.org>
parents:
24734
diff
changeset
|
178 |
24734
5d8c4cbc56d7
don't use singleton pattern for child_list
John W. Eaton <jwe@octave.org>
parents:
24540
diff
changeset
|
179 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
|
180 { |
5d8c4cbc56d7
don't use singleton pattern for child_list
John W. Eaton <jwe@octave.org>
parents:
24540
diff
changeset
|
181 interpreter& interp = __get_interpreter__ (who); |
5d8c4cbc56d7
don't use singleton pattern for child_list
John W. Eaton <jwe@octave.org>
parents:
24540
diff
changeset
|
182 |
5d8c4cbc56d7
don't use singleton pattern for child_list
John W. Eaton <jwe@octave.org>
parents:
24540
diff
changeset
|
183 return interp.get_child_list (); |
5d8c4cbc56d7
don't use singleton pattern for child_list
John W. Eaton <jwe@octave.org>
parents:
24540
diff
changeset
|
184 } |
5d8c4cbc56d7
don't use singleton pattern for child_list
John W. Eaton <jwe@octave.org>
parents:
24540
diff
changeset
|
185 |
23651
5c6cceef132b
don't use singleton for cdef_manager object
John W. Eaton <jwe@octave.org>
parents:
23627
diff
changeset
|
186 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
|
187 { |
5c6cceef132b
don't use singleton for cdef_manager object
John W. Eaton <jwe@octave.org>
parents:
23627
diff
changeset
|
188 interpreter& interp = __get_interpreter__ (who); |
5c6cceef132b
don't use singleton for cdef_manager object
John W. Eaton <jwe@octave.org>
parents:
23627
diff
changeset
|
189 |
5c6cceef132b
don't use singleton for cdef_manager object
John W. Eaton <jwe@octave.org>
parents:
23627
diff
changeset
|
190 return interp.get_cdef_manager (); |
5c6cceef132b
don't use singleton for cdef_manager object
John W. Eaton <jwe@octave.org>
parents:
23627
diff
changeset
|
191 } |
23774
41795b504a8b
don't use singleton for gtk_manager
John W. Eaton <jwe@octave.org>
parents:
23721
diff
changeset
|
192 |
27266
596312d4f25d
don't use singleton pattern for display_info class
John W. Eaton <jwe@octave.org>
parents:
27263
diff
changeset
|
193 display_info& __get_display_info__ (const std::string& who) |
596312d4f25d
don't use singleton pattern for display_info class
John W. Eaton <jwe@octave.org>
parents:
27263
diff
changeset
|
194 { |
596312d4f25d
don't use singleton pattern for display_info class
John W. Eaton <jwe@octave.org>
parents:
27263
diff
changeset
|
195 interpreter& interp = __get_interpreter__ (who); |
596312d4f25d
don't use singleton pattern for display_info class
John W. Eaton <jwe@octave.org>
parents:
27263
diff
changeset
|
196 |
596312d4f25d
don't use singleton pattern for display_info class
John W. Eaton <jwe@octave.org>
parents:
27263
diff
changeset
|
197 return interp.get_display_info (); |
596312d4f25d
don't use singleton pattern for display_info class
John W. Eaton <jwe@octave.org>
parents:
27263
diff
changeset
|
198 } |
596312d4f25d
don't use singleton pattern for display_info class
John W. Eaton <jwe@octave.org>
parents:
27263
diff
changeset
|
199 |
23774
41795b504a8b
don't use singleton for gtk_manager
John W. Eaton <jwe@octave.org>
parents:
23721
diff
changeset
|
200 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
|
201 { |
41795b504a8b
don't use singleton for gtk_manager
John W. Eaton <jwe@octave.org>
parents:
23721
diff
changeset
|
202 interpreter& interp = __get_interpreter__ (who); |
41795b504a8b
don't use singleton for gtk_manager
John W. Eaton <jwe@octave.org>
parents:
23721
diff
changeset
|
203 |
41795b504a8b
don't use singleton for gtk_manager
John W. Eaton <jwe@octave.org>
parents:
23721
diff
changeset
|
204 return interp.get_gtk_manager (); |
41795b504a8b
don't use singleton for gtk_manager
John W. Eaton <jwe@octave.org>
parents:
23721
diff
changeset
|
205 } |
26863
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_value |
27102
84ff9953faa1
where possible, eliminate octave:: namespace qualifier inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
26864
diff
changeset
|
208 get_function_handle (interpreter& interp, const octave_value& arg, |
26863
c589db954a4e
new functions for getting a functicon from an octave_value object
John W. Eaton <jwe@octave.org>
parents:
26769
diff
changeset
|
209 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
|
210 { |
c589db954a4e
new functions for getting a functicon from an octave_value object
John W. Eaton <jwe@octave.org>
parents:
26769
diff
changeset
|
211 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
|
212 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
|
213 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
|
214 } |
c589db954a4e
new functions for getting a functicon from an octave_value object
John W. Eaton <jwe@octave.org>
parents:
26769
diff
changeset
|
215 |
c589db954a4e
new functions for getting a functicon from an octave_value object
John W. Eaton <jwe@octave.org>
parents:
26769
diff
changeset
|
216 octave_value |
27102
84ff9953faa1
where possible, eliminate octave:: namespace qualifier inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
26864
diff
changeset
|
217 get_function_handle (interpreter& interp, const octave_value& arg, |
26863
c589db954a4e
new functions for getting a functicon from an octave_value object
John W. Eaton <jwe@octave.org>
parents:
26769
diff
changeset
|
218 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
|
219 { |
c589db954a4e
new functions for getting a functicon from an octave_value object
John W. Eaton <jwe@octave.org>
parents:
26769
diff
changeset
|
220 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
|
221 return arg; |
c589db954a4e
new functions for getting a functicon from an octave_value object
John W. Eaton <jwe@octave.org>
parents:
26769
diff
changeset
|
222 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
|
223 { |
c589db954a4e
new functions for getting a functicon from an octave_value object
John W. Eaton <jwe@octave.org>
parents:
26769
diff
changeset
|
224 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
|
225 |
c589db954a4e
new functions for getting a functicon from an octave_value object
John W. Eaton <jwe@octave.org>
parents:
26769
diff
changeset
|
226 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
|
227 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
|
228 |
27102
84ff9953faa1
where possible, eliminate octave:: namespace qualifier inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
26864
diff
changeset
|
229 symbol_table& symtab = interp.get_symbol_table (); |
26863
c589db954a4e
new functions for getting a functicon from an octave_value object
John W. Eaton <jwe@octave.org>
parents:
26769
diff
changeset
|
230 |
c589db954a4e
new functions for getting a functicon from an octave_value object
John W. Eaton <jwe@octave.org>
parents:
26769
diff
changeset
|
231 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
|
232 |
c589db954a4e
new functions for getting a functicon from an octave_value object
John W. Eaton <jwe@octave.org>
parents:
26769
diff
changeset
|
233 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
|
234 return fcn; |
c589db954a4e
new functions for getting a functicon from an octave_value object
John W. Eaton <jwe@octave.org>
parents:
26769
diff
changeset
|
235 |
c589db954a4e
new functions for getting a functicon from an octave_value object
John W. Eaton <jwe@octave.org>
parents:
26769
diff
changeset
|
236 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
|
237 |
26864
041caa61ed34
use get_function_handle instead of extract_function
John W. Eaton <jwe@octave.org>
parents:
26863
diff
changeset
|
238 // 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
|
239 // 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
|
240 |
c589db954a4e
new functions for getting a functicon from an octave_value object
John W. Eaton <jwe@octave.org>
parents:
26769
diff
changeset
|
241 return fcn; |
c589db954a4e
new functions for getting a functicon from an octave_value object
John W. Eaton <jwe@octave.org>
parents:
26769
diff
changeset
|
242 } |
c589db954a4e
new functions for getting a functicon from an octave_value object
John W. Eaton <jwe@octave.org>
parents:
26769
diff
changeset
|
243 |
c589db954a4e
new functions for getting a functicon from an octave_value object
John W. Eaton <jwe@octave.org>
parents:
26769
diff
changeset
|
244 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
|
245 } |
23438 | 246 } |