Mercurial > octave
annotate libinterp/parse-tree/pt-misc.cc @ 22323:bac0d6f07a3e
maint: Update copyright notices for 2016.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Wed, 17 Aug 2016 01:05:19 -0400 |
parents | b571fc85953f |
children | 34ce5be04942 |
rev | line source |
---|---|
577 | 1 /* |
2 | |
22323
bac0d6f07a3e
maint: Update copyright notices for 2016.
John W. Eaton <jwe@octave.org>
parents:
21751
diff
changeset
|
3 Copyright (C) 1994-2016 John W. Eaton |
577 | 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. | |
577 | 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/>. | |
577 | 20 |
21 */ | |
22 | |
21724
aba2e6293dd8
use "#if ..." consistently instead of "#ifdef" and "#ifndef"
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
23 #if defined (HAVE_CONFIG_H) |
21301
40de9f8f23a6
Use '#include "config.h"' rather than <config.h>.
Rik <rik@octave.org>
parents:
21200
diff
changeset
|
24 # include "config.h" |
577 | 25 #endif |
26 | |
5848 | 27 #include "Cell.h" |
28 | |
4466 | 29 #include "defun.h" |
2982 | 30 #include "error.h" |
31 #include "ov.h" | |
32 #include "oct-lvalue.h" | |
33 #include "pt-id.h" | |
34 #include "pt-idx.h" | |
35 #include "pt-misc.h" | |
36 #include "pt-walk.h" | |
4466 | 37 #include "utils.h" |
38 | |
577 | 39 // Parameter lists. |
40 | |
1742 | 41 tree_parameter_list::~tree_parameter_list (void) |
42 { | |
4219 | 43 while (! empty ()) |
1742 | 44 { |
4219 | 45 iterator p = begin (); |
46 delete *p; | |
47 erase (p); | |
1742 | 48 } |
49 } | |
50 | |
577 | 51 void |
52 tree_parameter_list::mark_as_formal_parameters (void) | |
53 { | |
4219 | 54 for (iterator p = begin (); p != end (); p++) |
577 | 55 { |
6215 | 56 tree_decl_elt *elt = *p; |
577 | 57 elt->mark_as_formal_parameter (); |
58 } | |
59 } | |
60 | |
7587
1f662945c2be
handle varargin and varargout without keywords
John W. Eaton <jwe@octave.org>
parents:
7336
diff
changeset
|
61 bool |
1f662945c2be
handle varargin and varargout without keywords
John W. Eaton <jwe@octave.org>
parents:
7336
diff
changeset
|
62 tree_parameter_list::validate (in_or_out type) |
1f662945c2be
handle varargin and varargout without keywords
John W. Eaton <jwe@octave.org>
parents:
7336
diff
changeset
|
63 { |
1f662945c2be
handle varargin and varargout without keywords
John W. Eaton <jwe@octave.org>
parents:
7336
diff
changeset
|
64 bool retval = true; |
1f662945c2be
handle varargin and varargout without keywords
John W. Eaton <jwe@octave.org>
parents:
7336
diff
changeset
|
65 |
1f662945c2be
handle varargin and varargout without keywords
John W. Eaton <jwe@octave.org>
parents:
7336
diff
changeset
|
66 std::set<std::string> dict; |
1f662945c2be
handle varargin and varargout without keywords
John W. Eaton <jwe@octave.org>
parents:
7336
diff
changeset
|
67 |
1f662945c2be
handle varargin and varargout without keywords
John W. Eaton <jwe@octave.org>
parents:
7336
diff
changeset
|
68 for (iterator p = begin (); p != end (); p++) |
1f662945c2be
handle varargin and varargout without keywords
John W. Eaton <jwe@octave.org>
parents:
7336
diff
changeset
|
69 { |
1f662945c2be
handle varargin and varargout without keywords
John W. Eaton <jwe@octave.org>
parents:
7336
diff
changeset
|
70 tree_decl_elt *elt = *p; |
1f662945c2be
handle varargin and varargout without keywords
John W. Eaton <jwe@octave.org>
parents:
7336
diff
changeset
|
71 |
1f662945c2be
handle varargin and varargout without keywords
John W. Eaton <jwe@octave.org>
parents:
7336
diff
changeset
|
72 tree_identifier *id = elt->ident (); |
1f662945c2be
handle varargin and varargout without keywords
John W. Eaton <jwe@octave.org>
parents:
7336
diff
changeset
|
73 |
1f662945c2be
handle varargin and varargout without keywords
John W. Eaton <jwe@octave.org>
parents:
7336
diff
changeset
|
74 if (id) |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10206
diff
changeset
|
75 { |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10206
diff
changeset
|
76 std::string name = id->name (); |
7587
1f662945c2be
handle varargin and varargout without keywords
John W. Eaton <jwe@octave.org>
parents:
7336
diff
changeset
|
77 |
10206
37a08e0ce2dc
support Matlab-style empty output/input arguments
Jaroslav Hajek <highegg@gmail.com>
parents:
10160
diff
changeset
|
78 if (id->is_black_hole ()) |
37a08e0ce2dc
support Matlab-style empty output/input arguments
Jaroslav Hajek <highegg@gmail.com>
parents:
10160
diff
changeset
|
79 { |
37a08e0ce2dc
support Matlab-style empty output/input arguments
Jaroslav Hajek <highegg@gmail.com>
parents:
10160
diff
changeset
|
80 if (type != in) |
37a08e0ce2dc
support Matlab-style empty output/input arguments
Jaroslav Hajek <highegg@gmail.com>
parents:
10160
diff
changeset
|
81 error ("invalid use of ~ in output list"); |
37a08e0ce2dc
support Matlab-style empty output/input arguments
Jaroslav Hajek <highegg@gmail.com>
parents:
10160
diff
changeset
|
82 } |
37a08e0ce2dc
support Matlab-style empty output/input arguments
Jaroslav Hajek <highegg@gmail.com>
parents:
10160
diff
changeset
|
83 else if (dict.find (name) != dict.end ()) |
20832
3951d420556c
eliminate return statements after calls to error
John W. Eaton <jwe@octave.org>
parents:
20818
diff
changeset
|
84 error ("'%s' appears more than once in parameter list", |
3951d420556c
eliminate return statements after calls to error
John W. Eaton <jwe@octave.org>
parents:
20818
diff
changeset
|
85 name.c_str ()); |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10206
diff
changeset
|
86 else |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10206
diff
changeset
|
87 dict.insert (name); |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10206
diff
changeset
|
88 } |
7587
1f662945c2be
handle varargin and varargout without keywords
John W. Eaton <jwe@octave.org>
parents:
7336
diff
changeset
|
89 } |
1f662945c2be
handle varargin and varargout without keywords
John W. Eaton <jwe@octave.org>
parents:
7336
diff
changeset
|
90 |
20555
f90c8372b7ba
eliminate many more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20423
diff
changeset
|
91 std::string va_type = (type == in ? "varargin" : "varargout"); |
7587
1f662945c2be
handle varargin and varargout without keywords
John W. Eaton <jwe@octave.org>
parents:
7336
diff
changeset
|
92 |
20555
f90c8372b7ba
eliminate many more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20423
diff
changeset
|
93 size_t len = length (); |
7587
1f662945c2be
handle varargin and varargout without keywords
John W. Eaton <jwe@octave.org>
parents:
7336
diff
changeset
|
94 |
20555
f90c8372b7ba
eliminate many more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20423
diff
changeset
|
95 if (len > 0) |
f90c8372b7ba
eliminate many more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20423
diff
changeset
|
96 { |
f90c8372b7ba
eliminate many more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20423
diff
changeset
|
97 tree_decl_elt *elt = back (); |
7587
1f662945c2be
handle varargin and varargout without keywords
John W. Eaton <jwe@octave.org>
parents:
7336
diff
changeset
|
98 |
20555
f90c8372b7ba
eliminate many more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20423
diff
changeset
|
99 tree_identifier *id = elt->ident (); |
7587
1f662945c2be
handle varargin and varargout without keywords
John W. Eaton <jwe@octave.org>
parents:
7336
diff
changeset
|
100 |
20555
f90c8372b7ba
eliminate many more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20423
diff
changeset
|
101 if (id && id->name () == va_type) |
f90c8372b7ba
eliminate many more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20423
diff
changeset
|
102 { |
f90c8372b7ba
eliminate many more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20423
diff
changeset
|
103 if (len == 1) |
f90c8372b7ba
eliminate many more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20423
diff
changeset
|
104 mark_varargs_only (); |
f90c8372b7ba
eliminate many more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20423
diff
changeset
|
105 else |
f90c8372b7ba
eliminate many more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20423
diff
changeset
|
106 mark_varargs (); |
7587
1f662945c2be
handle varargin and varargout without keywords
John W. Eaton <jwe@octave.org>
parents:
7336
diff
changeset
|
107 |
20555
f90c8372b7ba
eliminate many more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20423
diff
changeset
|
108 iterator p = end (); |
f90c8372b7ba
eliminate many more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20423
diff
changeset
|
109 --p; |
f90c8372b7ba
eliminate many more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20423
diff
changeset
|
110 delete *p; |
f90c8372b7ba
eliminate many more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20423
diff
changeset
|
111 erase (p); |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10206
diff
changeset
|
112 } |
7587
1f662945c2be
handle varargin and varargout without keywords
John W. Eaton <jwe@octave.org>
parents:
7336
diff
changeset
|
113 } |
1f662945c2be
handle varargin and varargout without keywords
John W. Eaton <jwe@octave.org>
parents:
7336
diff
changeset
|
114 |
1f662945c2be
handle varargin and varargout without keywords
John W. Eaton <jwe@octave.org>
parents:
7336
diff
changeset
|
115 return retval; |
1f662945c2be
handle varargin and varargout without keywords
John W. Eaton <jwe@octave.org>
parents:
7336
diff
changeset
|
116 } |
1f662945c2be
handle varargin and varargout without keywords
John W. Eaton <jwe@octave.org>
parents:
7336
diff
changeset
|
117 |
577 | 118 void |
4466 | 119 tree_parameter_list::initialize_undefined_elements (const std::string& warnfor, |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
120 int nargout, |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
121 const octave_value& val) |
1093 | 122 { |
4466 | 123 bool warned = false; |
124 | |
125 int count = 0; | |
126 | |
10832
1b2fcd122c6a
allow user detect ignored outputs in m-functions
Jaroslav Hajek <highegg@gmail.com>
parents:
10315
diff
changeset
|
127 octave_value tmp = symbol_table::varval (".ignored."); |
1b2fcd122c6a
allow user detect ignored outputs in m-functions
Jaroslav Hajek <highegg@gmail.com>
parents:
10315
diff
changeset
|
128 const Matrix ignored = tmp.is_defined () ? tmp.matrix_value () : Matrix (); |
1b2fcd122c6a
allow user detect ignored outputs in m-functions
Jaroslav Hajek <highegg@gmail.com>
parents:
10315
diff
changeset
|
129 |
1b2fcd122c6a
allow user detect ignored outputs in m-functions
Jaroslav Hajek <highegg@gmail.com>
parents:
10315
diff
changeset
|
130 octave_idx_type k = 0; |
1b2fcd122c6a
allow user detect ignored outputs in m-functions
Jaroslav Hajek <highegg@gmail.com>
parents:
10315
diff
changeset
|
131 |
4219 | 132 for (iterator p = begin (); p != end (); p++) |
1093 | 133 { |
4466 | 134 if (++count > nargout) |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10206
diff
changeset
|
135 break; |
4466 | 136 |
6215 | 137 tree_decl_elt *elt = *p; |
2948 | 138 |
7336 | 139 if (! elt->is_variable ()) |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10206
diff
changeset
|
140 { |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10206
diff
changeset
|
141 if (! warned) |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10206
diff
changeset
|
142 { |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10206
diff
changeset
|
143 warned = true; |
5781 | 144 |
10832
1b2fcd122c6a
allow user detect ignored outputs in m-functions
Jaroslav Hajek <highegg@gmail.com>
parents:
10315
diff
changeset
|
145 while (k < ignored.numel ()) |
1b2fcd122c6a
allow user detect ignored outputs in m-functions
Jaroslav Hajek <highegg@gmail.com>
parents:
10315
diff
changeset
|
146 { |
1b2fcd122c6a
allow user detect ignored outputs in m-functions
Jaroslav Hajek <highegg@gmail.com>
parents:
10315
diff
changeset
|
147 octave_idx_type l = ignored (k); |
1b2fcd122c6a
allow user detect ignored outputs in m-functions
Jaroslav Hajek <highegg@gmail.com>
parents:
10315
diff
changeset
|
148 if (l == count) |
1b2fcd122c6a
allow user detect ignored outputs in m-functions
Jaroslav Hajek <highegg@gmail.com>
parents:
10315
diff
changeset
|
149 { |
1b2fcd122c6a
allow user detect ignored outputs in m-functions
Jaroslav Hajek <highegg@gmail.com>
parents:
10315
diff
changeset
|
150 warned = false; |
1b2fcd122c6a
allow user detect ignored outputs in m-functions
Jaroslav Hajek <highegg@gmail.com>
parents:
10315
diff
changeset
|
151 break; |
1b2fcd122c6a
allow user detect ignored outputs in m-functions
Jaroslav Hajek <highegg@gmail.com>
parents:
10315
diff
changeset
|
152 } |
1b2fcd122c6a
allow user detect ignored outputs in m-functions
Jaroslav Hajek <highegg@gmail.com>
parents:
10315
diff
changeset
|
153 else if (l > count) |
1b2fcd122c6a
allow user detect ignored outputs in m-functions
Jaroslav Hajek <highegg@gmail.com>
parents:
10315
diff
changeset
|
154 break; |
1b2fcd122c6a
allow user detect ignored outputs in m-functions
Jaroslav Hajek <highegg@gmail.com>
parents:
10315
diff
changeset
|
155 else |
1b2fcd122c6a
allow user detect ignored outputs in m-functions
Jaroslav Hajek <highegg@gmail.com>
parents:
10315
diff
changeset
|
156 k++; |
1b2fcd122c6a
allow user detect ignored outputs in m-functions
Jaroslav Hajek <highegg@gmail.com>
parents:
10315
diff
changeset
|
157 } |
1b2fcd122c6a
allow user detect ignored outputs in m-functions
Jaroslav Hajek <highegg@gmail.com>
parents:
10315
diff
changeset
|
158 |
1b2fcd122c6a
allow user detect ignored outputs in m-functions
Jaroslav Hajek <highegg@gmail.com>
parents:
10315
diff
changeset
|
159 if (warned) |
1b2fcd122c6a
allow user detect ignored outputs in m-functions
Jaroslav Hajek <highegg@gmail.com>
parents:
10315
diff
changeset
|
160 { |
1b2fcd122c6a
allow user detect ignored outputs in m-functions
Jaroslav Hajek <highegg@gmail.com>
parents:
10315
diff
changeset
|
161 warning_with_id |
1b2fcd122c6a
allow user detect ignored outputs in m-functions
Jaroslav Hajek <highegg@gmail.com>
parents:
10315
diff
changeset
|
162 ("Octave:undefined-return-values", |
1b2fcd122c6a
allow user detect ignored outputs in m-functions
Jaroslav Hajek <highegg@gmail.com>
parents:
10315
diff
changeset
|
163 "%s: some elements in list of return values are undefined", |
1b2fcd122c6a
allow user detect ignored outputs in m-functions
Jaroslav Hajek <highegg@gmail.com>
parents:
10315
diff
changeset
|
164 warnfor.c_str ()); |
1b2fcd122c6a
allow user detect ignored outputs in m-functions
Jaroslav Hajek <highegg@gmail.com>
parents:
10315
diff
changeset
|
165 } |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10206
diff
changeset
|
166 } |
4466 | 167 |
10958
80cf5bf4232c
avoid GCC shadow variable warning
John W. Eaton <jwe@octave.org>
parents:
10832
diff
changeset
|
168 octave_lvalue lval = elt->lvalue (); |
2973 | 169 |
10958
80cf5bf4232c
avoid GCC shadow variable warning
John W. Eaton <jwe@octave.org>
parents:
10832
diff
changeset
|
170 lval.assign (octave_value::op_asn_eq, val); |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10206
diff
changeset
|
171 } |
1093 | 172 } |
173 } | |
174 | |
175 void | |
2086 | 176 tree_parameter_list::define_from_arg_vector (const octave_value_list& args) |
577 | 177 { |
712 | 178 int expected_nargin = length (); |
577 | 179 |
4219 | 180 iterator p = begin (); |
577 | 181 |
712 | 182 for (int i = 0; i < expected_nargin; i++) |
577 | 183 { |
6215 | 184 tree_decl_elt *elt = *p++; |
577 | 185 |
2979 | 186 octave_lvalue ref = elt->lvalue (); |
2959 | 187 |
20818
cef0448a6ed2
eliminate unnecessary uses of nargin
John W. Eaton <jwe@octave.org>
parents:
20555
diff
changeset
|
188 if (i < args.length ()) |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10206
diff
changeset
|
189 { |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10206
diff
changeset
|
190 if (args(i).is_defined () && args(i).is_magic_colon ()) |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10206
diff
changeset
|
191 { |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10206
diff
changeset
|
192 if (! elt->eval ()) |
20832
3951d420556c
eliminate return statements after calls to error
John W. Eaton <jwe@octave.org>
parents:
20818
diff
changeset
|
193 error ("no default value for argument %d", i+1); |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10206
diff
changeset
|
194 } |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10206
diff
changeset
|
195 else |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10206
diff
changeset
|
196 ref.define (args(i)); |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10206
diff
changeset
|
197 } |
2891 | 198 else |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10206
diff
changeset
|
199 elt->eval (); |
577 | 200 } |
201 } | |
202 | |
3239 | 203 void |
4219 | 204 tree_parameter_list::undefine (void) |
3239 | 205 { |
206 int len = length (); | |
207 | |
4219 | 208 iterator p = begin (); |
3239 | 209 |
210 for (int i = 0; i < len; i++) | |
211 { | |
6215 | 212 tree_decl_elt *elt = *p++; |
3239 | 213 |
214 octave_lvalue ref = elt->lvalue (); | |
215 | |
3538 | 216 ref.assign (octave_value::op_asn_eq, octave_value ()); |
3239 | 217 } |
218 } | |
219 | |
16360
11115c237231
recognize variables when parsing (bug #38576)
John W. Eaton <jwe@octave.org>
parents:
15467
diff
changeset
|
220 std::list<std::string> |
11115c237231
recognize variables when parsing (bug #38576)
John W. Eaton <jwe@octave.org>
parents:
15467
diff
changeset
|
221 tree_parameter_list::variable_names (void) const |
11115c237231
recognize variables when parsing (bug #38576)
John W. Eaton <jwe@octave.org>
parents:
15467
diff
changeset
|
222 { |
11115c237231
recognize variables when parsing (bug #38576)
John W. Eaton <jwe@octave.org>
parents:
15467
diff
changeset
|
223 std::list<std::string> retval; |
11115c237231
recognize variables when parsing (bug #38576)
John W. Eaton <jwe@octave.org>
parents:
15467
diff
changeset
|
224 |
11115c237231
recognize variables when parsing (bug #38576)
John W. Eaton <jwe@octave.org>
parents:
15467
diff
changeset
|
225 for (const_iterator p = begin (); p != end (); p++) |
11115c237231
recognize variables when parsing (bug #38576)
John W. Eaton <jwe@octave.org>
parents:
15467
diff
changeset
|
226 { |
11115c237231
recognize variables when parsing (bug #38576)
John W. Eaton <jwe@octave.org>
parents:
15467
diff
changeset
|
227 tree_decl_elt *elt = *p; |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
228 |
16360
11115c237231
recognize variables when parsing (bug #38576)
John W. Eaton <jwe@octave.org>
parents:
15467
diff
changeset
|
229 retval.push_back (elt->name ()); |
11115c237231
recognize variables when parsing (bug #38576)
John W. Eaton <jwe@octave.org>
parents:
15467
diff
changeset
|
230 } |
11115c237231
recognize variables when parsing (bug #38576)
John W. Eaton <jwe@octave.org>
parents:
15467
diff
changeset
|
231 |
11115c237231
recognize variables when parsing (bug #38576)
John W. Eaton <jwe@octave.org>
parents:
15467
diff
changeset
|
232 return retval; |
11115c237231
recognize variables when parsing (bug #38576)
John W. Eaton <jwe@octave.org>
parents:
15467
diff
changeset
|
233 } |
11115c237231
recognize variables when parsing (bug #38576)
John W. Eaton <jwe@octave.org>
parents:
15467
diff
changeset
|
234 |
2086 | 235 octave_value_list |
9644
080e11f1b0c1
don't return undefined output values from user functions
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
236 tree_parameter_list::convert_to_const_vector (int nargout, |
080e11f1b0c1
don't return undefined output values from user functions
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
237 const Cell& varargout) |
577 | 238 { |
5848 | 239 octave_idx_type vlen = varargout.numel (); |
9691
318e0cdd31bd
improve OOP subsref handling
Jaroslav Hajek <highegg@gmail.com>
parents:
9644
diff
changeset
|
240 int len = length (); |
577 | 241 |
21751
b571fc85953f
maint: Use two spaces after period to indicate sentence break.
Rik <rik@octave.org>
parents:
21724
diff
changeset
|
242 // Special case. Will do a shallow copy. |
9691
318e0cdd31bd
improve OOP subsref handling
Jaroslav Hajek <highegg@gmail.com>
parents:
9644
diff
changeset
|
243 if (len == 0) |
9644
080e11f1b0c1
don't return undefined output values from user functions
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
244 return varargout; |
9691
318e0cdd31bd
improve OOP subsref handling
Jaroslav Hajek <highegg@gmail.com>
parents:
9644
diff
changeset
|
245 else if (nargout <= len) |
318e0cdd31bd
improve OOP subsref handling
Jaroslav Hajek <highegg@gmail.com>
parents:
9644
diff
changeset
|
246 { |
318e0cdd31bd
improve OOP subsref handling
Jaroslav Hajek <highegg@gmail.com>
parents:
9644
diff
changeset
|
247 octave_value_list retval (nargout); |
318e0cdd31bd
improve OOP subsref handling
Jaroslav Hajek <highegg@gmail.com>
parents:
9644
diff
changeset
|
248 |
318e0cdd31bd
improve OOP subsref handling
Jaroslav Hajek <highegg@gmail.com>
parents:
9644
diff
changeset
|
249 int i = 0; |
723 | 250 |
9691
318e0cdd31bd
improve OOP subsref handling
Jaroslav Hajek <highegg@gmail.com>
parents:
9644
diff
changeset
|
251 for (iterator p = begin (); p != end (); p++) |
318e0cdd31bd
improve OOP subsref handling
Jaroslav Hajek <highegg@gmail.com>
parents:
9644
diff
changeset
|
252 { |
318e0cdd31bd
improve OOP subsref handling
Jaroslav Hajek <highegg@gmail.com>
parents:
9644
diff
changeset
|
253 tree_decl_elt *elt = *p; |
318e0cdd31bd
improve OOP subsref handling
Jaroslav Hajek <highegg@gmail.com>
parents:
9644
diff
changeset
|
254 if (elt->is_defined ()) |
318e0cdd31bd
improve OOP subsref handling
Jaroslav Hajek <highegg@gmail.com>
parents:
9644
diff
changeset
|
255 retval(i++) = elt->rvalue1 (); |
318e0cdd31bd
improve OOP subsref handling
Jaroslav Hajek <highegg@gmail.com>
parents:
9644
diff
changeset
|
256 else |
318e0cdd31bd
improve OOP subsref handling
Jaroslav Hajek <highegg@gmail.com>
parents:
9644
diff
changeset
|
257 break; |
318e0cdd31bd
improve OOP subsref handling
Jaroslav Hajek <highegg@gmail.com>
parents:
9644
diff
changeset
|
258 } |
577 | 259 |
9691
318e0cdd31bd
improve OOP subsref handling
Jaroslav Hajek <highegg@gmail.com>
parents:
9644
diff
changeset
|
260 return retval; |
577 | 261 } |
9691
318e0cdd31bd
improve OOP subsref handling
Jaroslav Hajek <highegg@gmail.com>
parents:
9644
diff
changeset
|
262 else |
318e0cdd31bd
improve OOP subsref handling
Jaroslav Hajek <highegg@gmail.com>
parents:
9644
diff
changeset
|
263 { |
318e0cdd31bd
improve OOP subsref handling
Jaroslav Hajek <highegg@gmail.com>
parents:
9644
diff
changeset
|
264 octave_value_list retval (len + vlen); |
577 | 265 |
9691
318e0cdd31bd
improve OOP subsref handling
Jaroslav Hajek <highegg@gmail.com>
parents:
9644
diff
changeset
|
266 int i = 0; |
9644
080e11f1b0c1
don't return undefined output values from user functions
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
267 |
9691
318e0cdd31bd
improve OOP subsref handling
Jaroslav Hajek <highegg@gmail.com>
parents:
9644
diff
changeset
|
268 for (iterator p = begin (); p != end (); p++) |
318e0cdd31bd
improve OOP subsref handling
Jaroslav Hajek <highegg@gmail.com>
parents:
9644
diff
changeset
|
269 { |
318e0cdd31bd
improve OOP subsref handling
Jaroslav Hajek <highegg@gmail.com>
parents:
9644
diff
changeset
|
270 tree_decl_elt *elt = *p; |
318e0cdd31bd
improve OOP subsref handling
Jaroslav Hajek <highegg@gmail.com>
parents:
9644
diff
changeset
|
271 retval(i++) = elt->rvalue1 (); |
318e0cdd31bd
improve OOP subsref handling
Jaroslav Hajek <highegg@gmail.com>
parents:
9644
diff
changeset
|
272 } |
723 | 273 |
9691
318e0cdd31bd
improve OOP subsref handling
Jaroslav Hajek <highegg@gmail.com>
parents:
9644
diff
changeset
|
274 for (octave_idx_type j = 0; j < vlen; j++) |
318e0cdd31bd
improve OOP subsref handling
Jaroslav Hajek <highegg@gmail.com>
parents:
9644
diff
changeset
|
275 retval(i++) = varargout(j); |
9644
080e11f1b0c1
don't return undefined output values from user functions
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
276 |
9691
318e0cdd31bd
improve OOP subsref handling
Jaroslav Hajek <highegg@gmail.com>
parents:
9644
diff
changeset
|
277 return retval; |
318e0cdd31bd
improve OOP subsref handling
Jaroslav Hajek <highegg@gmail.com>
parents:
9644
diff
changeset
|
278 } |
577 | 279 } |
280 | |
1827 | 281 bool |
577 | 282 tree_parameter_list::is_defined (void) |
283 { | |
1827 | 284 bool status = true; |
577 | 285 |
4219 | 286 for (iterator p = begin (); p != end (); p++) |
577 | 287 { |
6215 | 288 tree_decl_elt *elt = *p; |
577 | 289 |
7336 | 290 if (! elt->is_variable ()) |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10206
diff
changeset
|
291 { |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10206
diff
changeset
|
292 status = false; |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10206
diff
changeset
|
293 break; |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10206
diff
changeset
|
294 } |
577 | 295 } |
296 | |
297 return status; | |
298 } | |
299 | |
5861 | 300 tree_parameter_list * |
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7587
diff
changeset
|
301 tree_parameter_list::dup (symbol_table::scope_id scope, |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10206
diff
changeset
|
302 symbol_table::context_id context) const |
5861 | 303 { |
304 tree_parameter_list *new_list = new tree_parameter_list (); | |
305 | |
306 if (takes_varargs ()) | |
307 new_list->mark_varargs (); | |
308 | |
8913
35cd375d4bb3
make tree::dup functions const
John W. Eaton <jwe@octave.org>
parents:
8658
diff
changeset
|
309 for (const_iterator p = begin (); p != end (); p++) |
5861 | 310 { |
8913
35cd375d4bb3
make tree::dup functions const
John W. Eaton <jwe@octave.org>
parents:
8658
diff
changeset
|
311 const tree_decl_elt *elt = *p; |
5861 | 312 |
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7587
diff
changeset
|
313 new_list->append (elt->dup (scope, context)); |
5861 | 314 } |
315 | |
316 return new_list; | |
317 } | |
318 | |
577 | 319 void |
2124 | 320 tree_parameter_list::accept (tree_walker& tw) |
581 | 321 { |
2124 | 322 tw.visit_parameter_list (*this); |
581 | 323 } |
324 | |
325 // Return lists. | |
326 | |
1742 | 327 tree_return_list::~tree_return_list (void) |
328 { | |
4219 | 329 while (! empty ()) |
1742 | 330 { |
4219 | 331 iterator p = begin (); |
332 delete *p; | |
333 erase (p); | |
1742 | 334 } |
335 } | |
336 | |
5861 | 337 tree_return_list * |
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7587
diff
changeset
|
338 tree_return_list::dup (symbol_table::scope_id scope, |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10206
diff
changeset
|
339 symbol_table::context_id context) const |
5861 | 340 { |
341 tree_return_list *new_list = new tree_return_list (); | |
342 | |
8913
35cd375d4bb3
make tree::dup functions const
John W. Eaton <jwe@octave.org>
parents:
8658
diff
changeset
|
343 for (const_iterator p = begin (); p != end (); p++) |
5861 | 344 { |
8913
35cd375d4bb3
make tree::dup functions const
John W. Eaton <jwe@octave.org>
parents:
8658
diff
changeset
|
345 const tree_index_expression *elt = *p; |
5861 | 346 |
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7587
diff
changeset
|
347 new_list->append (elt->dup (scope, context)); |
5861 | 348 } |
349 | |
350 return new_list; | |
351 } | |
352 | |
581 | 353 void |
2124 | 354 tree_return_list::accept (tree_walker& tw) |
581 | 355 { |
2124 | 356 tw.visit_return_list (*this); |
581 | 357 } |