Mercurial > octave
annotate libinterp/octave-value/ov-builtin.h @ 23532:084245f9bd03
pass reference to evaluator to octave_function call methods
* interpreter-private.h, interpreter-private.cc: (__get_evaluator__):
New function.
* interpreter.h, interpreter.cc (interpreter::m_evaluator):
Now a reference instead of a pointer. Change all uses.
(interpreter::get_evaluator): New function.
(intrepreter::current_evaluator): Delete. Replace all uses with
__get_evaluator__.
* ov-fcn.h, ov-fcn.cc (octave_function::call): Pass reference to
tree_evaluator. Change all functions in derived classes and all
uses.
(octave_function::subsref): Delete.
* ov-usr-fcn.h, ov-usr-fcn.cc (octave_user_script::subsref): Delete.
* pt-eval.h, pt-eval.cc (tree_evaluator::m_interpreter): Now a
reference instead of a pointer. Change all uses.
* ov-classdef.h, ov-classdef.cc (execute_ov): Delete. Replaces uses
with calls to feval.
(octave_classdef_superclass_ref::subsref): Delete.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 25 May 2017 13:13:17 -0400 |
parents | 9f925aed7d1b |
children | 3bb0a937c071 |
rev | line source |
---|---|
2974 | 1 /* |
2 | |
23219
3ac9f9ecfae5
maint: Update copyright dates.
John W. Eaton <jwe@octave.org>
parents:
23083
diff
changeset
|
3 Copyright (C) 1996-2017 John W. Eaton |
2974 | 4 |
5 This file is part of Octave. | |
6 | |
7 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
|
8 under the terms of the GNU General Public License as published by |
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22407
diff
changeset
|
9 the Free Software Foundation; either version 3 of the License, or |
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22407
diff
changeset
|
10 (at your option) any later version. |
2974 | 11 |
22755
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22407
diff
changeset
|
12 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
|
13 WITHOUT ANY WARRANTY; without even the implied warranty of |
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22407
diff
changeset
|
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22407
diff
changeset
|
15 GNU General Public License for more details. |
2974 | 16 |
17 You should have received a copy of the GNU General Public License | |
7016 | 18 along with Octave; see the file COPYING. If not, see |
19 <http://www.gnu.org/licenses/>. | |
2974 | 20 |
21 */ | |
22 | |
20791
f7084eae3318
maint: Use Octave coding conventions for #if statements.
Rik <rik@octave.org>
parents:
19697
diff
changeset
|
23 #if ! defined (octave_ov_builtin_h) |
17822
ebb3ef964372
maint: Use common #define syntax "octave_filename_h" in h_files.
Rik <rik@octave.org>
parents:
17787
diff
changeset
|
24 #define octave_ov_builtin_h 1 |
2974 | 25 |
21244
1473547f50f5
include octave-config.h in public header files
John W. Eaton <jwe@octave.org>
parents:
21017
diff
changeset
|
26 #include "octave-config.h" |
1473547f50f5
include octave-config.h in public header files
John W. Eaton <jwe@octave.org>
parents:
21017
diff
changeset
|
27 |
22897
4090c32fccf8
store set of dispatch classes in built-in function objects
John W. Eaton <jwe@octave.org>
parents:
22869
diff
changeset
|
28 #include <list> |
4090c32fccf8
store set of dispatch classes in built-in function objects
John W. Eaton <jwe@octave.org>
parents:
22869
diff
changeset
|
29 #include <set> |
2974 | 30 #include <string> |
31 | |
32 #include "ov-fcn.h" | |
33 #include "ov-typeinfo.h" | |
34 | |
35 class octave_value; | |
36 class octave_value_list; | |
14973 | 37 class jit_type; |
2974 | 38 |
23518 | 39 namespace octave |
40 { | |
23532
084245f9bd03
pass reference to evaluator to octave_function call methods
John W. Eaton <jwe@octave.org>
parents:
23520
diff
changeset
|
41 class tree_evaluator; |
23518 | 42 class interpreter; |
43 } | |
44 | |
2974 | 45 // Builtin functions. |
46 | |
47 class | |
7349 | 48 OCTINTERP_API |
2974 | 49 octave_builtin : public octave_function |
50 { | |
51 public: | |
52 | |
15004
ea6997657614
which: provide source file name for built-in functions
John W. Eaton <jwe@octave.org>
parents:
14974
diff
changeset
|
53 octave_builtin (void) : octave_function (), f (0), file (), jtype (0) { } |
4642 | 54 |
23518 | 55 typedef octave_value_list (*meth) (octave::interpreter&, |
56 const octave_value_list&, int); | |
57 | |
2974 | 58 typedef octave_value_list (*fcn) (const octave_value_list&, int); |
59 | |
21017
93748bcaec17
maint: Replace emtpy 'std::string ()' calls with "".
Rik <rik@octave.org>
parents:
20791
diff
changeset
|
60 octave_builtin (fcn ff, const std::string& nm = "", |
93748bcaec17
maint: Replace emtpy 'std::string ()' calls with "".
Rik <rik@octave.org>
parents:
20791
diff
changeset
|
61 const std::string& ds = "") |
23518 | 62 : octave_function (nm, ds), f (ff), m (0), file (), jtype (0) { } |
63 | |
64 octave_builtin (meth mm, const std::string& nm = "", | |
65 const std::string& ds = "") | |
66 : octave_function (nm, ds), f (0), m (mm), file (), jtype (0) { } | |
15004
ea6997657614
which: provide source file name for built-in functions
John W. Eaton <jwe@octave.org>
parents:
14974
diff
changeset
|
67 |
ea6997657614
which: provide source file name for built-in functions
John W. Eaton <jwe@octave.org>
parents:
14974
diff
changeset
|
68 octave_builtin (fcn ff, const std::string& nm, const std::string& fnm, |
ea6997657614
which: provide source file name for built-in functions
John W. Eaton <jwe@octave.org>
parents:
14974
diff
changeset
|
69 const std::string& ds) |
23518 | 70 : octave_function (nm, ds), f (ff), m (0), file (fnm), jtype (0) { } |
71 | |
72 octave_builtin (meth mm, const std::string& nm, const std::string& fnm, | |
73 const std::string& ds) | |
74 : octave_function (nm, ds), f (0), m (mm), file (fnm), jtype (0) { } | |
2974 | 75 |
22869
f75d289645ec
make deleted functions public
John W. Eaton <jwe@octave.org>
parents:
22868
diff
changeset
|
76 // No copying! |
f75d289645ec
make deleted functions public
John W. Eaton <jwe@octave.org>
parents:
22868
diff
changeset
|
77 |
f75d289645ec
make deleted functions public
John W. Eaton <jwe@octave.org>
parents:
22868
diff
changeset
|
78 octave_builtin (const octave_builtin& ob) = delete; |
f75d289645ec
make deleted functions public
John W. Eaton <jwe@octave.org>
parents:
22868
diff
changeset
|
79 |
f75d289645ec
make deleted functions public
John W. Eaton <jwe@octave.org>
parents:
22868
diff
changeset
|
80 octave_builtin& operator = (const octave_builtin& ob) = delete; |
f75d289645ec
make deleted functions public
John W. Eaton <jwe@octave.org>
parents:
22868
diff
changeset
|
81 |
22868
87e3163f6c87
use c++11 "= default" syntax for declaration of trivial destructors
John W. Eaton <jwe@octave.org>
parents:
22865
diff
changeset
|
82 ~octave_builtin (void) = default; |
2974 | 83 |
15005
74c7265c057a
fix failure with function handles caused by changeset ea6997657614
John W. Eaton <jwe@octave.org>
parents:
15004
diff
changeset
|
84 std::string src_file_name (void) const { return file; } |
15004
ea6997657614
which: provide source file name for built-in functions
John W. Eaton <jwe@octave.org>
parents:
14974
diff
changeset
|
85 |
23446
cd4e1ee28716
maint: Use convention 'void * fcn ()' for functions which return pointers.
Rik <rik@octave.org>
parents:
23220
diff
changeset
|
86 octave_function * function_value (bool = false) { return this; } |
2974 | 87 |
3325 | 88 bool is_builtin_function (void) const { return true; } |
89 | |
23532
084245f9bd03
pass reference to evaluator to octave_function call methods
John W. Eaton <jwe@octave.org>
parents:
23520
diff
changeset
|
90 octave_value_list call (octave::tree_evaluator& tw, int nargout, |
084245f9bd03
pass reference to evaluator to octave_function call methods
John W. Eaton <jwe@octave.org>
parents:
23520
diff
changeset
|
91 const octave_value_list& args); |
2974 | 92 |
23446
cd4e1ee28716
maint: Use convention 'void * fcn ()' for functions which return pointers.
Rik <rik@octave.org>
parents:
23220
diff
changeset
|
93 jit_type * to_jit (void) const; |
14973 | 94 |
95 void stash_jit (jit_type& type); | |
96 | |
14974
e3cd4c9d7ccc
Generalize builtin specification in JIT and add support for cos and exp
Max Brister <max@2bass.com>
parents:
14973
diff
changeset
|
97 fcn function (void) const; |
e3cd4c9d7ccc
Generalize builtin specification in JIT and add support for cos and exp
Max Brister <max@2bass.com>
parents:
14973
diff
changeset
|
98 |
23518 | 99 meth method (void) const; |
100 | |
22897
4090c32fccf8
store set of dispatch classes in built-in function objects
John W. Eaton <jwe@octave.org>
parents:
22869
diff
changeset
|
101 void push_dispatch_class (const std::string& dispatch_type); |
4090c32fccf8
store set of dispatch classes in built-in function objects
John W. Eaton <jwe@octave.org>
parents:
22869
diff
changeset
|
102 |
4090c32fccf8
store set of dispatch classes in built-in function objects
John W. Eaton <jwe@octave.org>
parents:
22869
diff
changeset
|
103 bool handles_dispatch_class (const std::string& dispatch_type) const; |
4090c32fccf8
store set of dispatch classes in built-in function objects
John W. Eaton <jwe@octave.org>
parents:
22869
diff
changeset
|
104 |
3325 | 105 protected: |
106 | |
107 // A pointer to the actual function. | |
108 fcn f; | |
23518 | 109 meth m; |
3325 | 110 |
15004
ea6997657614
which: provide source file name for built-in functions
John W. Eaton <jwe@octave.org>
parents:
14974
diff
changeset
|
111 // The name of the file where this function was defined. |
ea6997657614
which: provide source file name for built-in functions
John W. Eaton <jwe@octave.org>
parents:
14974
diff
changeset
|
112 std::string file; |
ea6997657614
which: provide source file name for built-in functions
John W. Eaton <jwe@octave.org>
parents:
14974
diff
changeset
|
113 |
22897
4090c32fccf8
store set of dispatch classes in built-in function objects
John W. Eaton <jwe@octave.org>
parents:
22869
diff
changeset
|
114 // The types this function has been declared to handle (if any). |
4090c32fccf8
store set of dispatch classes in built-in function objects
John W. Eaton <jwe@octave.org>
parents:
22869
diff
changeset
|
115 std::set<std::string> dispatch_classes; |
4090c32fccf8
store set of dispatch classes in built-in function objects
John W. Eaton <jwe@octave.org>
parents:
22869
diff
changeset
|
116 |
14973 | 117 // A pointer to the jit type that represents the function. |
118 jit_type *jtype; | |
119 | |
2974 | 120 private: |
121 | |
4612 | 122 DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA |
2974 | 123 }; |
124 | |
125 #endif |