Mercurial > hg > octave-nkf
annotate libinterp/parse-tree/pt-misc.cc @ 15467:049e8bbff782
maint: periodic merge of stable to default
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Mon, 01 Oct 2012 18:30:44 -0400 |
parents | src/pt-misc.cc@d174210ce1ec src/pt-misc.cc@2fc554ffbc28 |
children | 11115c237231 |
rev | line source |
---|---|
577 | 1 /* |
2 | |
14138
72c96de7a403
maint: update copyright notices for 2012
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
3 Copyright (C) 1994-2012 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 | |
23 #ifdef HAVE_CONFIG_H | |
1192 | 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 ()) |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10206
diff
changeset
|
84 { |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10206
diff
changeset
|
85 retval = false; |
15466
d174210ce1ec
use ' instead of ` in error messages, warnings and most comments
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
86 error ("'%s' appears more than once in parameter list", |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10206
diff
changeset
|
87 name.c_str ()); |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10206
diff
changeset
|
88 break; |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10206
diff
changeset
|
89 } |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10206
diff
changeset
|
90 else |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10206
diff
changeset
|
91 dict.insert (name); |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10206
diff
changeset
|
92 } |
7587
1f662945c2be
handle varargin and varargout without keywords
John W. Eaton <jwe@octave.org>
parents:
7336
diff
changeset
|
93 } |
1f662945c2be
handle varargin and varargout without keywords
John W. Eaton <jwe@octave.org>
parents:
7336
diff
changeset
|
94 |
1f662945c2be
handle varargin and varargout without keywords
John W. Eaton <jwe@octave.org>
parents:
7336
diff
changeset
|
95 if (! error_state) |
1f662945c2be
handle varargin and varargout without keywords
John W. Eaton <jwe@octave.org>
parents:
7336
diff
changeset
|
96 { |
1f662945c2be
handle varargin and varargout without keywords
John W. Eaton <jwe@octave.org>
parents:
7336
diff
changeset
|
97 std::string va_type = (type == in ? "varargin" : "varargout"); |
1f662945c2be
handle varargin and varargout without keywords
John W. Eaton <jwe@octave.org>
parents:
7336
diff
changeset
|
98 |
1f662945c2be
handle varargin and varargout without keywords
John W. Eaton <jwe@octave.org>
parents:
7336
diff
changeset
|
99 size_t len = length (); |
1f662945c2be
handle varargin and varargout without keywords
John W. Eaton <jwe@octave.org>
parents:
7336
diff
changeset
|
100 |
1f662945c2be
handle varargin and varargout without keywords
John W. Eaton <jwe@octave.org>
parents:
7336
diff
changeset
|
101 if (len > 0) |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10206
diff
changeset
|
102 { |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10206
diff
changeset
|
103 tree_decl_elt *elt = back (); |
7587
1f662945c2be
handle varargin and varargout without keywords
John W. Eaton <jwe@octave.org>
parents:
7336
diff
changeset
|
104 |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10206
diff
changeset
|
105 tree_identifier *id = elt->ident (); |
7587
1f662945c2be
handle varargin and varargout without keywords
John W. Eaton <jwe@octave.org>
parents:
7336
diff
changeset
|
106 |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10206
diff
changeset
|
107 if (id && id->name () == va_type) |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10206
diff
changeset
|
108 { |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10206
diff
changeset
|
109 if (len == 1) |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10206
diff
changeset
|
110 mark_varargs_only (); |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10206
diff
changeset
|
111 else |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10206
diff
changeset
|
112 mark_varargs (); |
7587
1f662945c2be
handle varargin and varargout without keywords
John W. Eaton <jwe@octave.org>
parents:
7336
diff
changeset
|
113 |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10206
diff
changeset
|
114 iterator p = end (); |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10206
diff
changeset
|
115 --p; |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10206
diff
changeset
|
116 delete *p; |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10206
diff
changeset
|
117 erase (p); |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10206
diff
changeset
|
118 } |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10206
diff
changeset
|
119 } |
7587
1f662945c2be
handle varargin and varargout without keywords
John W. Eaton <jwe@octave.org>
parents:
7336
diff
changeset
|
120 } |
1f662945c2be
handle varargin and varargout without keywords
John W. Eaton <jwe@octave.org>
parents:
7336
diff
changeset
|
121 |
1f662945c2be
handle varargin and varargout without keywords
John W. Eaton <jwe@octave.org>
parents:
7336
diff
changeset
|
122 return retval; |
1f662945c2be
handle varargin and varargout without keywords
John W. Eaton <jwe@octave.org>
parents:
7336
diff
changeset
|
123 } |
1f662945c2be
handle varargin and varargout without keywords
John W. Eaton <jwe@octave.org>
parents:
7336
diff
changeset
|
124 |
577 | 125 void |
4466 | 126 tree_parameter_list::initialize_undefined_elements (const std::string& warnfor, |
10832
1b2fcd122c6a
allow user detect ignored outputs in m-functions
Jaroslav Hajek <highegg@gmail.com>
parents:
10315
diff
changeset
|
127 int nargout, const octave_value& val) |
1093 | 128 { |
4466 | 129 bool warned = false; |
130 | |
131 int count = 0; | |
132 | |
10832
1b2fcd122c6a
allow user detect ignored outputs in m-functions
Jaroslav Hajek <highegg@gmail.com>
parents:
10315
diff
changeset
|
133 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
|
134 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
|
135 |
1b2fcd122c6a
allow user detect ignored outputs in m-functions
Jaroslav Hajek <highegg@gmail.com>
parents:
10315
diff
changeset
|
136 octave_idx_type k = 0; |
1b2fcd122c6a
allow user detect ignored outputs in m-functions
Jaroslav Hajek <highegg@gmail.com>
parents:
10315
diff
changeset
|
137 |
4219 | 138 for (iterator p = begin (); p != end (); p++) |
1093 | 139 { |
4466 | 140 if (++count > nargout) |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10206
diff
changeset
|
141 break; |
4466 | 142 |
6215 | 143 tree_decl_elt *elt = *p; |
2948 | 144 |
7336 | 145 if (! elt->is_variable ()) |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10206
diff
changeset
|
146 { |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10206
diff
changeset
|
147 if (! warned) |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10206
diff
changeset
|
148 { |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10206
diff
changeset
|
149 warned = true; |
5781 | 150 |
10832
1b2fcd122c6a
allow user detect ignored outputs in m-functions
Jaroslav Hajek <highegg@gmail.com>
parents:
10315
diff
changeset
|
151 while (k < ignored.numel ()) |
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 octave_idx_type l = ignored (k); |
1b2fcd122c6a
allow user detect ignored outputs in m-functions
Jaroslav Hajek <highegg@gmail.com>
parents:
10315
diff
changeset
|
154 if (l == count) |
1b2fcd122c6a
allow user detect ignored outputs in m-functions
Jaroslav Hajek <highegg@gmail.com>
parents:
10315
diff
changeset
|
155 { |
1b2fcd122c6a
allow user detect ignored outputs in m-functions
Jaroslav Hajek <highegg@gmail.com>
parents:
10315
diff
changeset
|
156 warned = false; |
1b2fcd122c6a
allow user detect ignored outputs in m-functions
Jaroslav Hajek <highegg@gmail.com>
parents:
10315
diff
changeset
|
157 break; |
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 else if (l > count) |
1b2fcd122c6a
allow user detect ignored outputs in m-functions
Jaroslav Hajek <highegg@gmail.com>
parents:
10315
diff
changeset
|
160 break; |
1b2fcd122c6a
allow user detect ignored outputs in m-functions
Jaroslav Hajek <highegg@gmail.com>
parents:
10315
diff
changeset
|
161 else |
1b2fcd122c6a
allow user detect ignored outputs in m-functions
Jaroslav Hajek <highegg@gmail.com>
parents:
10315
diff
changeset
|
162 k++; |
1b2fcd122c6a
allow user detect ignored outputs in m-functions
Jaroslav Hajek <highegg@gmail.com>
parents:
10315
diff
changeset
|
163 } |
1b2fcd122c6a
allow user detect ignored outputs in m-functions
Jaroslav Hajek <highegg@gmail.com>
parents:
10315
diff
changeset
|
164 |
1b2fcd122c6a
allow user detect ignored outputs in m-functions
Jaroslav Hajek <highegg@gmail.com>
parents:
10315
diff
changeset
|
165 if (warned) |
1b2fcd122c6a
allow user detect ignored outputs in m-functions
Jaroslav Hajek <highegg@gmail.com>
parents:
10315
diff
changeset
|
166 { |
1b2fcd122c6a
allow user detect ignored outputs in m-functions
Jaroslav Hajek <highegg@gmail.com>
parents:
10315
diff
changeset
|
167 warning_with_id |
1b2fcd122c6a
allow user detect ignored outputs in m-functions
Jaroslav Hajek <highegg@gmail.com>
parents:
10315
diff
changeset
|
168 ("Octave:undefined-return-values", |
1b2fcd122c6a
allow user detect ignored outputs in m-functions
Jaroslav Hajek <highegg@gmail.com>
parents:
10315
diff
changeset
|
169 "%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
|
170 warnfor.c_str ()); |
1b2fcd122c6a
allow user detect ignored outputs in m-functions
Jaroslav Hajek <highegg@gmail.com>
parents:
10315
diff
changeset
|
171 } |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10206
diff
changeset
|
172 } |
4466 | 173 |
10958
80cf5bf4232c
avoid GCC shadow variable warning
John W. Eaton <jwe@octave.org>
parents:
10832
diff
changeset
|
174 octave_lvalue lval = elt->lvalue (); |
2973 | 175 |
10958
80cf5bf4232c
avoid GCC shadow variable warning
John W. Eaton <jwe@octave.org>
parents:
10832
diff
changeset
|
176 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
|
177 } |
1093 | 178 } |
179 } | |
180 | |
181 void | |
2086 | 182 tree_parameter_list::define_from_arg_vector (const octave_value_list& args) |
577 | 183 { |
712 | 184 int nargin = args.length (); |
185 | |
186 int expected_nargin = length (); | |
577 | 187 |
4219 | 188 iterator p = begin (); |
577 | 189 |
712 | 190 for (int i = 0; i < expected_nargin; i++) |
577 | 191 { |
6215 | 192 tree_decl_elt *elt = *p++; |
577 | 193 |
2979 | 194 octave_lvalue ref = elt->lvalue (); |
2959 | 195 |
577 | 196 if (i < nargin) |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10206
diff
changeset
|
197 { |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10206
diff
changeset
|
198 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
|
199 { |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10206
diff
changeset
|
200 if (! elt->eval ()) |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10206
diff
changeset
|
201 { |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10206
diff
changeset
|
202 ::error ("no default value for argument %d\n", i+1); |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10206
diff
changeset
|
203 return; |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10206
diff
changeset
|
204 } |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10206
diff
changeset
|
205 } |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10206
diff
changeset
|
206 else |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10206
diff
changeset
|
207 ref.define (args(i)); |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10206
diff
changeset
|
208 } |
2891 | 209 else |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10206
diff
changeset
|
210 elt->eval (); |
577 | 211 } |
212 } | |
213 | |
3239 | 214 void |
4219 | 215 tree_parameter_list::undefine (void) |
3239 | 216 { |
217 int len = length (); | |
218 | |
4219 | 219 iterator p = begin (); |
3239 | 220 |
221 for (int i = 0; i < len; i++) | |
222 { | |
6215 | 223 tree_decl_elt *elt = *p++; |
3239 | 224 |
225 octave_lvalue ref = elt->lvalue (); | |
226 | |
3538 | 227 ref.assign (octave_value::op_asn_eq, octave_value ()); |
3239 | 228 } |
229 } | |
230 | |
2086 | 231 octave_value_list |
9644
080e11f1b0c1
don't return undefined output values from user functions
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
232 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
|
233 const Cell& varargout) |
577 | 234 { |
5848 | 235 octave_idx_type vlen = varargout.numel (); |
9691
318e0cdd31bd
improve OOP subsref handling
Jaroslav Hajek <highegg@gmail.com>
parents:
9644
diff
changeset
|
236 int len = length (); |
577 | 237 |
9644
080e11f1b0c1
don't return undefined output values from user functions
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
238 // Special case. Will do a shallow copy. |
9691
318e0cdd31bd
improve OOP subsref handling
Jaroslav Hajek <highegg@gmail.com>
parents:
9644
diff
changeset
|
239 if (len == 0) |
9644
080e11f1b0c1
don't return undefined output values from user functions
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
240 return varargout; |
9691
318e0cdd31bd
improve OOP subsref handling
Jaroslav Hajek <highegg@gmail.com>
parents:
9644
diff
changeset
|
241 else if (nargout <= len) |
318e0cdd31bd
improve OOP subsref handling
Jaroslav Hajek <highegg@gmail.com>
parents:
9644
diff
changeset
|
242 { |
318e0cdd31bd
improve OOP subsref handling
Jaroslav Hajek <highegg@gmail.com>
parents:
9644
diff
changeset
|
243 octave_value_list retval (nargout); |
318e0cdd31bd
improve OOP subsref handling
Jaroslav Hajek <highegg@gmail.com>
parents:
9644
diff
changeset
|
244 |
318e0cdd31bd
improve OOP subsref handling
Jaroslav Hajek <highegg@gmail.com>
parents:
9644
diff
changeset
|
245 int i = 0; |
723 | 246 |
9691
318e0cdd31bd
improve OOP subsref handling
Jaroslav Hajek <highegg@gmail.com>
parents:
9644
diff
changeset
|
247 for (iterator p = begin (); p != end (); p++) |
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 tree_decl_elt *elt = *p; |
318e0cdd31bd
improve OOP subsref handling
Jaroslav Hajek <highegg@gmail.com>
parents:
9644
diff
changeset
|
250 if (elt->is_defined ()) |
318e0cdd31bd
improve OOP subsref handling
Jaroslav Hajek <highegg@gmail.com>
parents:
9644
diff
changeset
|
251 retval(i++) = elt->rvalue1 (); |
318e0cdd31bd
improve OOP subsref handling
Jaroslav Hajek <highegg@gmail.com>
parents:
9644
diff
changeset
|
252 else |
318e0cdd31bd
improve OOP subsref handling
Jaroslav Hajek <highegg@gmail.com>
parents:
9644
diff
changeset
|
253 break; |
318e0cdd31bd
improve OOP subsref handling
Jaroslav Hajek <highegg@gmail.com>
parents:
9644
diff
changeset
|
254 } |
577 | 255 |
9691
318e0cdd31bd
improve OOP subsref handling
Jaroslav Hajek <highegg@gmail.com>
parents:
9644
diff
changeset
|
256 return retval; |
577 | 257 } |
9691
318e0cdd31bd
improve OOP subsref handling
Jaroslav Hajek <highegg@gmail.com>
parents:
9644
diff
changeset
|
258 else |
318e0cdd31bd
improve OOP subsref handling
Jaroslav Hajek <highegg@gmail.com>
parents:
9644
diff
changeset
|
259 { |
318e0cdd31bd
improve OOP subsref handling
Jaroslav Hajek <highegg@gmail.com>
parents:
9644
diff
changeset
|
260 octave_value_list retval (len + vlen); |
577 | 261 |
9691
318e0cdd31bd
improve OOP subsref handling
Jaroslav Hajek <highegg@gmail.com>
parents:
9644
diff
changeset
|
262 int i = 0; |
9644
080e11f1b0c1
don't return undefined output values from user functions
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
263 |
9691
318e0cdd31bd
improve OOP subsref handling
Jaroslav Hajek <highegg@gmail.com>
parents:
9644
diff
changeset
|
264 for (iterator p = begin (); p != end (); p++) |
318e0cdd31bd
improve OOP subsref handling
Jaroslav Hajek <highegg@gmail.com>
parents:
9644
diff
changeset
|
265 { |
318e0cdd31bd
improve OOP subsref handling
Jaroslav Hajek <highegg@gmail.com>
parents:
9644
diff
changeset
|
266 tree_decl_elt *elt = *p; |
318e0cdd31bd
improve OOP subsref handling
Jaroslav Hajek <highegg@gmail.com>
parents:
9644
diff
changeset
|
267 retval(i++) = elt->rvalue1 (); |
318e0cdd31bd
improve OOP subsref handling
Jaroslav Hajek <highegg@gmail.com>
parents:
9644
diff
changeset
|
268 } |
723 | 269 |
9691
318e0cdd31bd
improve OOP subsref handling
Jaroslav Hajek <highegg@gmail.com>
parents:
9644
diff
changeset
|
270 for (octave_idx_type j = 0; j < vlen; j++) |
318e0cdd31bd
improve OOP subsref handling
Jaroslav Hajek <highegg@gmail.com>
parents:
9644
diff
changeset
|
271 retval(i++) = varargout(j); |
9644
080e11f1b0c1
don't return undefined output values from user functions
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
272 |
9691
318e0cdd31bd
improve OOP subsref handling
Jaroslav Hajek <highegg@gmail.com>
parents:
9644
diff
changeset
|
273 return retval; |
318e0cdd31bd
improve OOP subsref handling
Jaroslav Hajek <highegg@gmail.com>
parents:
9644
diff
changeset
|
274 } |
577 | 275 } |
276 | |
1827 | 277 bool |
577 | 278 tree_parameter_list::is_defined (void) |
279 { | |
1827 | 280 bool status = true; |
577 | 281 |
4219 | 282 for (iterator p = begin (); p != end (); p++) |
577 | 283 { |
6215 | 284 tree_decl_elt *elt = *p; |
577 | 285 |
7336 | 286 if (! elt->is_variable ()) |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10206
diff
changeset
|
287 { |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10206
diff
changeset
|
288 status = false; |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10206
diff
changeset
|
289 break; |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10206
diff
changeset
|
290 } |
577 | 291 } |
292 | |
293 return status; | |
294 } | |
295 | |
5861 | 296 tree_parameter_list * |
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7587
diff
changeset
|
297 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
|
298 symbol_table::context_id context) const |
5861 | 299 { |
300 tree_parameter_list *new_list = new tree_parameter_list (); | |
301 | |
302 if (takes_varargs ()) | |
303 new_list->mark_varargs (); | |
304 | |
8913
35cd375d4bb3
make tree::dup functions const
John W. Eaton <jwe@octave.org>
parents:
8658
diff
changeset
|
305 for (const_iterator p = begin (); p != end (); p++) |
5861 | 306 { |
8913
35cd375d4bb3
make tree::dup functions const
John W. Eaton <jwe@octave.org>
parents:
8658
diff
changeset
|
307 const tree_decl_elt *elt = *p; |
5861 | 308 |
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7587
diff
changeset
|
309 new_list->append (elt->dup (scope, context)); |
5861 | 310 } |
311 | |
312 return new_list; | |
313 } | |
314 | |
577 | 315 void |
2124 | 316 tree_parameter_list::accept (tree_walker& tw) |
581 | 317 { |
2124 | 318 tw.visit_parameter_list (*this); |
581 | 319 } |
320 | |
321 // Return lists. | |
322 | |
1742 | 323 tree_return_list::~tree_return_list (void) |
324 { | |
4219 | 325 while (! empty ()) |
1742 | 326 { |
4219 | 327 iterator p = begin (); |
328 delete *p; | |
329 erase (p); | |
1742 | 330 } |
331 } | |
332 | |
5861 | 333 tree_return_list * |
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7587
diff
changeset
|
334 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
|
335 symbol_table::context_id context) const |
5861 | 336 { |
337 tree_return_list *new_list = new tree_return_list (); | |
338 | |
8913
35cd375d4bb3
make tree::dup functions const
John W. Eaton <jwe@octave.org>
parents:
8658
diff
changeset
|
339 for (const_iterator p = begin (); p != end (); p++) |
5861 | 340 { |
8913
35cd375d4bb3
make tree::dup functions const
John W. Eaton <jwe@octave.org>
parents:
8658
diff
changeset
|
341 const tree_index_expression *elt = *p; |
5861 | 342 |
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7587
diff
changeset
|
343 new_list->append (elt->dup (scope, context)); |
5861 | 344 } |
345 | |
346 return new_list; | |
347 } | |
348 | |
581 | 349 void |
2124 | 350 tree_return_list::accept (tree_walker& tw) |
581 | 351 { |
2124 | 352 tw.visit_return_list (*this); |
581 | 353 } |