Mercurial > octave
annotate libinterp/octave-value/ov-fcn.h @ 15954:46ca8488de92 classdef
Re-engineer tree_expression postfix handling to make it more flexible.
* libinterp/octave-value/ov-fcn.h (octave_function::is_postfix_index_handled):
New method.
* libinterp/parse-tree/oct-parse.yy
(make_index_expression, make_indirect_ref): Set expression postfix index type.
* libinterp/parse-tree/pt-exp.h (tree_expression::postfix_index): Remove field.
(tree_expression::postfix_index_type): New field.
(tree_expression::tree_expression): Initialize it.
(tree_expression::copy_base): Copy it.
(tree_expression::set_postfix_index, tree_expression::postfix_index): New
methods.
(tree_expression::mark_postfix_indexed): Remove method.
(tree_expression::is_postfix_indexed): Use postfix_index_type field.
* libinterp/parse-tree/pt-id.cc (tree_identifier::rvalue): Let the function
object determine whether it can handle the first postfix index and call
do_multi_index_op if it can't.
| author | Michael Goffioul <michael.goffioul@gmail.com> |
|---|---|
| date | Tue, 15 Jan 2013 17:01:10 -0500 |
| parents | 5e5705b3e505 |
| children | 856cb7cba231 |
| rev | line source |
|---|---|
| 2974 | 1 /* |
| 2 | |
|
14138
72c96de7a403
maint: update copyright notices for 2012
John W. Eaton <jwe@octave.org>
parents:
13241
diff
changeset
|
3 Copyright (C) 1996-2012 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 | |
| 8 under the terms of the GNU General Public License as published by the | |
| 7016 | 9 Free Software Foundation; either version 3 of the License, or (at your |
| 10 option) any later version. | |
| 2974 | 11 |
| 12 Octave is distributed in the hope that it will be useful, but WITHOUT | |
| 13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 15 for more details. | |
| 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 | |
| 23 #if !defined (octave_function_h) | |
| 24 #define octave_function_h 1 | |
| 25 | |
| 26 #include <string> | |
| 27 | |
| 3258 | 28 #include "oct-time.h" |
| 3325 | 29 #include "str-vec.h" |
| 3258 | 30 |
| 2974 | 31 #include "oct-alloc.h" |
| 4748 | 32 #include "oct-obj.h" |
| 2974 | 33 #include "ov-base.h" |
| 34 #include "ov-typeinfo.h" | |
| 7336 | 35 #include "symtab.h" |
| 2974 | 36 |
| 2976 | 37 class tree_walker; |
| 38 | |
| 2974 | 39 // Functions. |
| 40 | |
| 41 class | |
| 6109 | 42 OCTINTERP_API |
| 2974 | 43 octave_function : public octave_base_value |
| 44 { | |
| 45 public: | |
| 46 | |
|
8785
70f5a0375afd
oct-map.h: fix think-o in previous change
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
47 octave_function (void) |
|
70f5a0375afd
oct-map.h: fix think-o in previous change
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
48 : relative (false), locked (false), private_function (false), |
|
70f5a0375afd
oct-map.h: fix think-o in previous change
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
49 xdispatch_class (), my_name (), my_dir_name (), doc () { } |
| 2974 | 50 |
| 51 ~octave_function (void) { } | |
| 52 | |
| 5759 | 53 octave_base_value *clone (void) const; |
| 54 octave_base_value *empty_clone (void) const; | |
| 2974 | 55 |
| 56 bool is_defined (void) const { return true; } | |
| 57 | |
| 58 bool is_function (void) const { return true; } | |
| 59 | |
| 3544 | 60 virtual bool is_system_fcn_file (void) const { return false; } |
| 2974 | 61 |
| 3523 | 62 virtual std::string fcn_file_name (void) const { return std::string (); } |
|
13141
e81ddf9cacd5
maint: untabify and remove trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
12783
diff
changeset
|
63 |
|
15005
74c7265c057a
fix failure with function handles caused by changeset ea6997657614
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
64 virtual std::string src_file_name (void) const { return std::string (); } |
|
74c7265c057a
fix failure with function handles caused by changeset ea6997657614
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
65 |
|
12783
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
11586
diff
changeset
|
66 // The name to show in the profiler (also used as map-key). |
|
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
11586
diff
changeset
|
67 virtual std::string profiler_name (void) const { return name (); } |
| 2974 | 68 |
| 6323 | 69 virtual std::string parent_fcn_name (void) const { return std::string (); } |
| 70 | |
|
7968
0d607e8dbbfa
eliminate curr_parent_function; fix subfunction lookup
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
71 virtual symbol_table::scope_id parent_fcn_scope (void) const { return -1; } |
|
0d607e8dbbfa
eliminate curr_parent_function; fix subfunction lookup
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
72 |
| 3255 | 73 virtual void mark_fcn_file_up_to_date (const octave_time&) { } |
| 3166 | 74 |
| 7336 | 75 virtual symbol_table::scope_id scope (void) { return -1; } |
| 76 | |
| 3255 | 77 virtual octave_time time_parsed (void) const |
| 78 { return octave_time (static_cast<time_t> (0)); } | |
| 2974 | 79 |
| 3255 | 80 virtual octave_time time_checked (void) const |
| 81 { return octave_time (static_cast<time_t> (0)); } | |
| 3166 | 82 |
|
11461
2b8531a6a3c9
Change mentions of "nested function" to the less misleading "subfunction"
David Grundberg <individ@acc.umu.se>
parents:
11445
diff
changeset
|
83 virtual bool is_subfunction (void) const { return false; } |
| 4343 | 84 |
|
11220
883b9308353c
allow class function to be called from methods as well as constructors
John W. Eaton <jwe@octave.org>
parents:
10313
diff
changeset
|
85 virtual bool is_class_constructor (const std::string& = std::string ()) const |
|
883b9308353c
allow class function to be called from methods as well as constructors
John W. Eaton <jwe@octave.org>
parents:
10313
diff
changeset
|
86 { return false; } |
| 5744 | 87 |
|
15869
5e5705b3e505
Implement some embryonic handle-classdef semantic.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15195
diff
changeset
|
88 virtual bool |
|
5e5705b3e505
Implement some embryonic handle-classdef semantic.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15195
diff
changeset
|
89 is_classdef_constructor (const std::string& = std::string ()) const |
|
5e5705b3e505
Implement some embryonic handle-classdef semantic.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15195
diff
changeset
|
90 { return false; } |
|
5e5705b3e505
Implement some embryonic handle-classdef semantic.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15195
diff
changeset
|
91 |
|
11220
883b9308353c
allow class function to be called from methods as well as constructors
John W. Eaton <jwe@octave.org>
parents:
10313
diff
changeset
|
92 virtual bool is_class_method (const std::string& = std::string ()) const |
|
883b9308353c
allow class function to be called from methods as well as constructors
John W. Eaton <jwe@octave.org>
parents:
10313
diff
changeset
|
93 { return false; } |
| 7336 | 94 |
| 4748 | 95 virtual bool takes_varargs (void) const { return false; } |
| 96 | |
| 97 virtual bool takes_var_return (void) const { return false; } | |
| 98 | |
|
8785
70f5a0375afd
oct-map.h: fix think-o in previous change
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
99 void stash_dispatch_class (const std::string& nm) { xdispatch_class = nm; } |
|
70f5a0375afd
oct-map.h: fix think-o in previous change
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
100 |
|
70f5a0375afd
oct-map.h: fix think-o in previous change
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
101 std::string dispatch_class (void) const { return xdispatch_class; } |
|
70f5a0375afd
oct-map.h: fix think-o in previous change
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
102 |
|
11445
40f311a69417
fix OO field access in subfunctions of private functions
John W. Eaton <jwe@octave.org>
parents:
11220
diff
changeset
|
103 virtual void |
|
40f311a69417
fix OO field access in subfunctions of private functions
John W. Eaton <jwe@octave.org>
parents:
11220
diff
changeset
|
104 mark_as_private_function (const std::string& cname = std::string ()) |
|
8785
70f5a0375afd
oct-map.h: fix think-o in previous change
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
105 { |
|
70f5a0375afd
oct-map.h: fix think-o in previous change
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
106 private_function = true; |
|
70f5a0375afd
oct-map.h: fix think-o in previous change
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
107 xdispatch_class = cname; |
|
70f5a0375afd
oct-map.h: fix think-o in previous change
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
108 } |
|
70f5a0375afd
oct-map.h: fix think-o in previous change
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
109 |
|
70f5a0375afd
oct-map.h: fix think-o in previous change
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
110 bool is_private_function (void) const { return private_function; } |
|
70f5a0375afd
oct-map.h: fix think-o in previous change
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
111 |
|
13241
2a8dcb5b3a00
improve default indexing for objects
John W. Eaton <jwe@octave.org>
parents:
13141
diff
changeset
|
112 bool is_private_function_of_class (const std::string& nm) const |
|
8785
70f5a0375afd
oct-map.h: fix think-o in previous change
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
113 { return private_function && xdispatch_class == nm; } |
|
70f5a0375afd
oct-map.h: fix think-o in previous change
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
114 |
|
13241
2a8dcb5b3a00
improve default indexing for objects
John W. Eaton <jwe@octave.org>
parents:
13141
diff
changeset
|
115 virtual bool |
|
2a8dcb5b3a00
improve default indexing for objects
John W. Eaton <jwe@octave.org>
parents:
13141
diff
changeset
|
116 is_anonymous_function_of_class (const std::string& = std::string ()) const |
|
2a8dcb5b3a00
improve default indexing for objects
John W. Eaton <jwe@octave.org>
parents:
13141
diff
changeset
|
117 { return false; } |
|
2a8dcb5b3a00
improve default indexing for objects
John W. Eaton <jwe@octave.org>
parents:
13141
diff
changeset
|
118 |
| 7336 | 119 std::string dir_name (void) const { return my_dir_name; } |
| 120 | |
| 121 void stash_dir_name (const std::string& dir) { my_dir_name = dir; } | |
| 122 | |
|
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
123 void lock (void) |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
124 { |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
125 this->lock_subfunctions (); |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
126 locked = true; |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
127 } |
| 7336 | 128 |
|
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
129 void unlock (void) |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
130 { |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
131 this->unlock_subfunctions (); |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
132 locked = false; |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
133 } |
| 7336 | 134 |
|
7489
8e4592e49fa7
don't clear locked functions
John W. Eaton <jwe@octave.org>
parents:
7438
diff
changeset
|
135 bool islocked (void) const { return locked; } |
| 7336 | 136 |
|
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
137 virtual void lock_subfunctions (void) { } |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
138 |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
139 virtual void unlock_subfunctions (void) { } |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7489
diff
changeset
|
140 |
| 6323 | 141 void mark_relative (void) { relative = true; } |
| 142 | |
| 143 bool is_relative (void) const { return relative; } | |
| 144 | |
| 3523 | 145 std::string name (void) const { return my_name; } |
| 2974 | 146 |
| 5823 | 147 void document (const std::string& ds) { doc = ds; } |
| 148 | |
| 3523 | 149 std::string doc_string (void) const { return doc; } |
| 2974 | 150 |
| 3325 | 151 virtual void unload (void) { } |
| 152 | |
| 2976 | 153 virtual void accept (tree_walker&) { } |
| 154 | |
|
15954
46ca8488de92
Re-engineer tree_expression postfix handling to make it more flexible.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15869
diff
changeset
|
155 virtual bool is_postfix_index_handled (char type) const |
|
46ca8488de92
Re-engineer tree_expression postfix handling to make it more flexible.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15869
diff
changeset
|
156 { return (type == '(' || type == '{'); } |
|
46ca8488de92
Re-engineer tree_expression postfix handling to make it more flexible.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15869
diff
changeset
|
157 |
| 2974 | 158 protected: |
| 159 | |
| 5864 | 160 octave_function (const std::string& nm, |
| 10313 | 161 const std::string& ds = std::string ()) |
|
10101
b51848e95e4b
cleanups to avoid valgrind warnings
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
162 : relative (false), locked (false), private_function (false), |
|
b51848e95e4b
cleanups to avoid valgrind warnings
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
163 xdispatch_class (), my_name (nm), my_dir_name (), doc (ds) { } |
| 6323 | 164 |
| 165 // TRUE if this function was found from a relative path element. | |
| 166 bool relative; | |
| 2974 | 167 |
| 7336 | 168 // TRUE if this function is tagged so that it can't be cleared. |
| 169 bool locked; | |
| 170 | |
|
8785
70f5a0375afd
oct-map.h: fix think-o in previous change
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
171 // TRUE means this is a private function. |
|
70f5a0375afd
oct-map.h: fix think-o in previous change
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
172 bool private_function; |
|
70f5a0375afd
oct-map.h: fix think-o in previous change
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
173 |
|
70f5a0375afd
oct-map.h: fix think-o in previous change
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
174 // If this object is a class method or constructor, or a private |
|
70f5a0375afd
oct-map.h: fix think-o in previous change
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
175 // function inside a class directory, this is the name of the class |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
176 // to which the method belongs. |
|
8785
70f5a0375afd
oct-map.h: fix think-o in previous change
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
177 std::string xdispatch_class; |
|
70f5a0375afd
oct-map.h: fix think-o in previous change
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
178 |
| 2974 | 179 // The name of this function. |
| 3523 | 180 std::string my_name; |
| 2974 | 181 |
| 7336 | 182 // The name of the directory in the path where we found this |
| 183 // function. May be relative. | |
| 184 std::string my_dir_name; | |
| 185 | |
| 2974 | 186 // The help text for this function. |
| 3523 | 187 std::string doc; |
| 2974 | 188 |
| 3325 | 189 private: |
| 190 | |
| 4645 | 191 // No copying! |
| 192 | |
| 193 octave_function (const octave_function& f); | |
| 194 | |
| 195 octave_function& operator = (const octave_function& f); | |
| 196 | |
| 3219 | 197 DECLARE_OCTAVE_ALLOCATOR |
| 2974 | 198 }; |
| 199 | |
| 200 #endif |