Mercurial > octave
annotate libinterp/octave-value/ov-builtin.h @ 23520:9f925aed7d1b
eliminate duplication in subsref methods for function objects
All function objects (built-in, mex, user-defined) have the same
definition for subsref, so provide one implementation in the base
function class instead of separate ones in each class.
* ov-usr-fcn.cc, ov-usr-fcn.h (octave_function::subsref): Define here.
* ov-builtin.cc, ov-builtin.h, ov-fcn.cc, ov-fcn.h, ov-mex-fcn.cc,
ov-mex-fcn.h: Delete all subsref methods except one for scripts.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Mon, 22 May 2017 13:45:19 -0400 |
| parents | 8744d4ed8fb4 |
| children | 084245f9bd03 |
| 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 { | |
| 41 class interpreter; | |
| 42 } | |
| 43 | |
| 2974 | 44 // Builtin functions. |
| 45 | |
| 46 class | |
| 7349 | 47 OCTINTERP_API |
| 2974 | 48 octave_builtin : public octave_function |
| 49 { | |
| 50 public: | |
| 51 | |
|
15004
ea6997657614
which: provide source file name for built-in functions
John W. Eaton <jwe@octave.org>
parents:
14974
diff
changeset
|
52 octave_builtin (void) : octave_function (), f (0), file (), jtype (0) { } |
| 4642 | 53 |
| 23518 | 54 typedef octave_value_list (*meth) (octave::interpreter&, |
| 55 const octave_value_list&, int); | |
| 56 | |
| 2974 | 57 typedef octave_value_list (*fcn) (const octave_value_list&, int); |
| 58 | |
|
21017
93748bcaec17
maint: Replace emtpy 'std::string ()' calls with "".
Rik <rik@octave.org>
parents:
20791
diff
changeset
|
59 octave_builtin (fcn ff, const std::string& nm = "", |
|
93748bcaec17
maint: Replace emtpy 'std::string ()' calls with "".
Rik <rik@octave.org>
parents:
20791
diff
changeset
|
60 const std::string& ds = "") |
| 23518 | 61 : octave_function (nm, ds), f (ff), m (0), file (), jtype (0) { } |
| 62 | |
| 63 octave_builtin (meth mm, const std::string& nm = "", | |
| 64 const std::string& ds = "") | |
| 65 : 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
|
66 |
|
ea6997657614
which: provide source file name for built-in functions
John W. Eaton <jwe@octave.org>
parents:
14974
diff
changeset
|
67 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
|
68 const std::string& ds) |
| 23518 | 69 : octave_function (nm, ds), f (ff), m (0), file (fnm), jtype (0) { } |
| 70 | |
| 71 octave_builtin (meth mm, const std::string& nm, const std::string& fnm, | |
| 72 const std::string& ds) | |
| 73 : octave_function (nm, ds), f (0), m (mm), file (fnm), jtype (0) { } | |
| 2974 | 74 |
|
22869
f75d289645ec
make deleted functions public
John W. Eaton <jwe@octave.org>
parents:
22868
diff
changeset
|
75 // No copying! |
|
f75d289645ec
make deleted functions public
John W. Eaton <jwe@octave.org>
parents:
22868
diff
changeset
|
76 |
|
f75d289645ec
make deleted functions public
John W. Eaton <jwe@octave.org>
parents:
22868
diff
changeset
|
77 octave_builtin (const octave_builtin& ob) = delete; |
|
f75d289645ec
make deleted functions public
John W. Eaton <jwe@octave.org>
parents:
22868
diff
changeset
|
78 |
|
f75d289645ec
make deleted functions public
John W. Eaton <jwe@octave.org>
parents:
22868
diff
changeset
|
79 octave_builtin& operator = (const octave_builtin& ob) = delete; |
|
f75d289645ec
make deleted functions public
John W. Eaton <jwe@octave.org>
parents:
22868
diff
changeset
|
80 |
|
22868
87e3163f6c87
use c++11 "= default" syntax for declaration of trivial destructors
John W. Eaton <jwe@octave.org>
parents:
22865
diff
changeset
|
81 ~octave_builtin (void) = default; |
| 2974 | 82 |
|
15005
74c7265c057a
fix failure with function handles caused by changeset ea6997657614
John W. Eaton <jwe@octave.org>
parents:
15004
diff
changeset
|
83 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
|
84 |
|
23446
cd4e1ee28716
maint: Use convention 'void * fcn ()' for functions which return pointers.
Rik <rik@octave.org>
parents:
23220
diff
changeset
|
85 octave_function * function_value (bool = false) { return this; } |
| 2974 | 86 |
| 3325 | 87 bool is_builtin_function (void) const { return true; } |
| 88 | |
|
23502
c6714ae1c06c
eliminate remaining do_multi_index_op methods
John W. Eaton <jwe@octave.org>
parents:
23481
diff
changeset
|
89 octave_value_list call (int nargout, const octave_value_list& args); |
| 2974 | 90 |
|
23446
cd4e1ee28716
maint: Use convention 'void * fcn ()' for functions which return pointers.
Rik <rik@octave.org>
parents:
23220
diff
changeset
|
91 jit_type * to_jit (void) const; |
| 14973 | 92 |
| 93 void stash_jit (jit_type& type); | |
| 94 | |
|
14974
e3cd4c9d7ccc
Generalize builtin specification in JIT and add support for cos and exp
Max Brister <max@2bass.com>
parents:
14973
diff
changeset
|
95 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
|
96 |
| 23518 | 97 meth method (void) const; |
| 98 | |
|
22897
4090c32fccf8
store set of dispatch classes in built-in function objects
John W. Eaton <jwe@octave.org>
parents:
22869
diff
changeset
|
99 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
|
100 |
|
4090c32fccf8
store set of dispatch classes in built-in function objects
John W. Eaton <jwe@octave.org>
parents:
22869
diff
changeset
|
101 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
|
102 |
| 3325 | 103 protected: |
| 104 | |
| 105 // A pointer to the actual function. | |
| 106 fcn f; | |
| 23518 | 107 meth m; |
| 3325 | 108 |
|
15004
ea6997657614
which: provide source file name for built-in functions
John W. Eaton <jwe@octave.org>
parents:
14974
diff
changeset
|
109 // 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
|
110 std::string file; |
|
ea6997657614
which: provide source file name for built-in functions
John W. Eaton <jwe@octave.org>
parents:
14974
diff
changeset
|
111 |
|
22897
4090c32fccf8
store set of dispatch classes in built-in function objects
John W. Eaton <jwe@octave.org>
parents:
22869
diff
changeset
|
112 // 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
|
113 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
|
114 |
| 14973 | 115 // A pointer to the jit type that represents the function. |
| 116 jit_type *jtype; | |
| 117 | |
| 2974 | 118 private: |
| 119 | |
| 4612 | 120 DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA |
| 2974 | 121 }; |
| 122 | |
| 123 #endif |