Mercurial > octave
annotate libinterp/corefcn/interpreter-private.h @ 27261:dccdc3b001a2
eliminate static functions from octave_link class
* octave-link.h, octave-link. (class octave_link): Convert all static
data and functions to normal data members and member functions.
Change all uses.
* interpreter-private.h, interpreter-private.cc (__get_octave_link__):
New function.
* interpreter.h, interpreter.cc (interpreter::m_octave_link):
New data member.
(interpreter::get_octave_link): New function.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Wed, 17 Jul 2019 14:09:20 -0400 |
parents | dc8df9a9e8b6 |
children | 99aa1bcb8848 |
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 (octave_interpreter_private_h) | |
24 #define octave_interpreter_private_h 1 | |
25 | |
26 #include "octave-config.h" | |
27 | |
26863
c589db954a4e
new functions for getting a functicon from an octave_value object
John W. Eaton <jwe@octave.org>
parents:
26774
diff
changeset
|
28 #include <list> |
23438 | 29 #include <string> |
30 | |
23599
5cb3a2bb5e1e
don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents:
23553
diff
changeset
|
31 #include "symtab.h" |
5cb3a2bb5e1e
don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents:
23553
diff
changeset
|
32 |
27261
dccdc3b001a2
eliminate static functions from octave_link class
John W. Eaton <jwe@octave.org>
parents:
27213
diff
changeset
|
33 class octave_link; |
dccdc3b001a2
eliminate static functions from octave_link class
John W. Eaton <jwe@octave.org>
parents:
27213
diff
changeset
|
34 |
23438 | 35 namespace octave |
36 { | |
24738
3695c2cd69b8
don't use singleton pattern for bp_table
John W. Eaton <jwe@octave.org>
parents:
24734
diff
changeset
|
37 class bp_table; |
26774
568c2ab2782d
move classdef classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
26376
diff
changeset
|
38 class cdef_manager; |
24734
5d8c4cbc56d7
don't use singleton pattern for child_list
John W. Eaton <jwe@octave.org>
parents:
24540
diff
changeset
|
39 class child_list; |
23627
0a6e87804cab
don't use singleton pattern for dynamic_loader class
John W. Eaton <jwe@octave.org>
parents:
23609
diff
changeset
|
40 class dynamic_loader; |
27160
6b0c61a5a0f0
move global error configuration and status variables inside a class
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
41 class error_system; |
23774
41795b504a8b
don't use singleton for gtk_manager
John W. Eaton <jwe@octave.org>
parents:
23721
diff
changeset
|
42 class gtk_manager; |
23721
b2d55b52ee51
new class to manage help system and associated variables
John W. Eaton <jwe@octave.org>
parents:
23651
diff
changeset
|
43 class help_system; |
25994
f881d3e271d2
eliminate global and file-scope static variables in oct-hist.cc
John W. Eaton <jwe@octave.org>
parents:
25993
diff
changeset
|
44 class history_system; |
25407
ab10403a0b50
new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents:
25054
diff
changeset
|
45 class input_system; |
24540
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
46 class interpreter; |
23511
232c8d69d934
manage interpreter instance in interpreter object
John W. Eaton <jwe@octave.org>
parents:
23438
diff
changeset
|
47 class load_path; |
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
|
48 class load_save_system; |
25435
a52e6fb674b1
eliminate some singletons and static & global variables
John W. Eaton <jwe@octave.org>
parents:
25407
diff
changeset
|
49 class output_system; |
23532
084245f9bd03
pass reference to evaluator to octave_function call methods
John W. Eaton <jwe@octave.org>
parents:
23517
diff
changeset
|
50 class tree_evaluator; |
24540
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
51 class type_info; |
23438 | 52 |
23517
1bc8f1f50b54
new function for accessing interpreter
John W. Eaton <jwe@octave.org>
parents:
23511
diff
changeset
|
53 extern interpreter& __get_interpreter__ (const std::string& who); |
1bc8f1f50b54
new function for accessing interpreter
John W. Eaton <jwe@octave.org>
parents:
23511
diff
changeset
|
54 |
23627
0a6e87804cab
don't use singleton pattern for dynamic_loader class
John W. Eaton <jwe@octave.org>
parents:
23609
diff
changeset
|
55 extern 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
|
56 |
27160
6b0c61a5a0f0
move global error configuration and status variables inside a class
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
57 extern 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
|
58 |
23721
b2d55b52ee51
new class to manage help system and associated variables
John W. Eaton <jwe@octave.org>
parents:
23651
diff
changeset
|
59 extern 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
|
60 |
25994
f881d3e271d2
eliminate global and file-scope static variables in oct-hist.cc
John W. Eaton <jwe@octave.org>
parents:
25993
diff
changeset
|
61 extern 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
|
62 |
25407
ab10403a0b50
new input_system class to manage user input for the interpreter
John W. Eaton <jwe@octave.org>
parents:
25054
diff
changeset
|
63 extern 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:
25054
diff
changeset
|
64 |
23438 | 65 extern load_path& __get_load_path__ (const std::string& who); |
23532
084245f9bd03
pass reference to evaluator to octave_function call methods
John W. Eaton <jwe@octave.org>
parents:
23517
diff
changeset
|
66 |
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
|
67 extern 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
|
68 |
27261
dccdc3b001a2
eliminate static functions from octave_link class
John W. Eaton <jwe@octave.org>
parents:
27213
diff
changeset
|
69 extern octave_link& __get_octave_link__ (const std::string& who); |
dccdc3b001a2
eliminate static functions from octave_link class
John W. Eaton <jwe@octave.org>
parents:
27213
diff
changeset
|
70 |
25435
a52e6fb674b1
eliminate some singletons and static & global variables
John W. Eaton <jwe@octave.org>
parents:
25407
diff
changeset
|
71 extern 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
|
72 |
24540
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
73 extern 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
|
74 |
23599
5cb3a2bb5e1e
don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents:
23553
diff
changeset
|
75 extern 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
|
76 |
24361
8bcfddad15ec
use shared_ptr to manage symbol_scope objects
John W. Eaton <jwe@octave.org>
parents:
24270
diff
changeset
|
77 extern 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
|
78 |
24361
8bcfddad15ec
use shared_ptr to manage symbol_scope objects
John W. Eaton <jwe@octave.org>
parents:
24270
diff
changeset
|
79 extern 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
|
80 |
23532
084245f9bd03
pass reference to evaluator to octave_function call methods
John W. Eaton <jwe@octave.org>
parents:
23517
diff
changeset
|
81 extern tree_evaluator& __get_evaluator__ (const std::string& who); |
23553
14723784b9f2
don't use singleton for call_stack
John W. Eaton <jwe@octave.org>
parents:
23532
diff
changeset
|
82 |
24738
3695c2cd69b8
don't use singleton pattern for bp_table
John W. Eaton <jwe@octave.org>
parents:
24734
diff
changeset
|
83 extern 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
|
84 |
24734
5d8c4cbc56d7
don't use singleton pattern for child_list
John W. Eaton <jwe@octave.org>
parents:
24540
diff
changeset
|
85 extern 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
|
86 |
23651
5c6cceef132b
don't use singleton for cdef_manager object
John W. Eaton <jwe@octave.org>
parents:
23627
diff
changeset
|
87 extern cdef_manager& __get_cdef_manager__ (const std::string& who); |
23774
41795b504a8b
don't use singleton for gtk_manager
John W. Eaton <jwe@octave.org>
parents:
23721
diff
changeset
|
88 |
41795b504a8b
don't use singleton for gtk_manager
John W. Eaton <jwe@octave.org>
parents:
23721
diff
changeset
|
89 extern gtk_manager& __get_gtk_manager__ (const std::string& who); |
26863
c589db954a4e
new functions for getting a functicon from an octave_value object
John W. Eaton <jwe@octave.org>
parents:
26774
diff
changeset
|
90 |
c589db954a4e
new functions for getting a functicon from an octave_value object
John W. Eaton <jwe@octave.org>
parents:
26774
diff
changeset
|
91 |
c589db954a4e
new functions for getting a functicon from an octave_value object
John W. Eaton <jwe@octave.org>
parents:
26774
diff
changeset
|
92 // Functions that could be methods in the interpreter class but maybe |
c589db954a4e
new functions for getting a functicon from an octave_value object
John W. Eaton <jwe@octave.org>
parents:
26774
diff
changeset
|
93 // shouldn't be exposed as part of the public interface. |
c589db954a4e
new functions for getting a functicon from an octave_value object
John W. Eaton <jwe@octave.org>
parents:
26774
diff
changeset
|
94 |
c589db954a4e
new functions for getting a functicon from an octave_value object
John W. Eaton <jwe@octave.org>
parents:
26774
diff
changeset
|
95 // Convert octave_value object ARG to be a function handle object. It |
c589db954a4e
new functions for getting a functicon from an octave_value object
John W. Eaton <jwe@octave.org>
parents:
26774
diff
changeset
|
96 // may be a function handle, inline function, the name of a function, |
c589db954a4e
new functions for getting a functicon from an octave_value object
John W. Eaton <jwe@octave.org>
parents:
26774
diff
changeset
|
97 // or the text of an inline function that has the given argument names |
26864
041caa61ed34
use get_function_handle instead of extract_function
John W. Eaton <jwe@octave.org>
parents:
26863
diff
changeset
|
98 // PARAMETER_NAMES. Use of the latter form is discouraged. |
26863
c589db954a4e
new functions for getting a functicon from an octave_value object
John W. Eaton <jwe@octave.org>
parents:
26774
diff
changeset
|
99 |
c589db954a4e
new functions for getting a functicon from an octave_value object
John W. Eaton <jwe@octave.org>
parents:
26774
diff
changeset
|
100 octave_value |
27102
84ff9953faa1
where possible, eliminate octave:: namespace qualifier inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
26864
diff
changeset
|
101 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:
26774
diff
changeset
|
102 const std::string& parameter_name); |
c589db954a4e
new functions for getting a functicon from an octave_value object
John W. Eaton <jwe@octave.org>
parents:
26774
diff
changeset
|
103 |
c589db954a4e
new functions for getting a functicon from an octave_value object
John W. Eaton <jwe@octave.org>
parents:
26774
diff
changeset
|
104 octave_value |
27102
84ff9953faa1
where possible, eliminate octave:: namespace qualifier inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
26864
diff
changeset
|
105 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:
26774
diff
changeset
|
106 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:
26774
diff
changeset
|
107 = std::list<std::string> ()); |
23438 | 108 } |
109 | |
110 #endif |