Mercurial > octave

comparison libinterp/parse-tree/pt-args-block.h @ 31607:aac27ad79be6 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Re-indent code after switch to using namespace macros. * build-env.h, build-env.in.cc, Cell.h, __betainc__.cc, __eigs__.cc, __ftp__.cc, __ichol__.cc, __ilu__.cc, __isprimelarge__.cc, __magick_read__.cc, __pchip_deriv__.cc, amd.cc, base-text-renderer.cc, base-text-renderer.h, besselj.cc, bitfcns.cc, bsxfun.cc, c-file-ptr-stream.h, call-stack.cc, call-stack.h, ccolamd.cc, cellfun.cc, chol.cc, colamd.cc, dasrt.cc, data.cc, debug.cc, defaults.cc, defaults.h, det.cc, display.cc, display.h, dlmread.cc, dynamic-ld.cc, dynamic-ld.h, ellipj.cc, environment.cc, environment.h, error.cc, error.h, errwarn.h, event-manager.cc, event-manager.h, event-queue.cc, event-queue.h, fcn-info.cc, fcn-info.h, fft.cc, fft2.cc, file-io.cc, filter.cc, find.cc, ft-text-renderer.cc, ft-text-renderer.h, gcd.cc, gl-render.cc, gl-render.h, gl2ps-print.cc, gl2ps-print.h, graphics-toolkit.cc, graphics-toolkit.h, graphics.cc, gsvd.cc, gtk-manager.cc, gtk-manager.h, help.cc, help.h, hook-fcn.cc, hook-fcn.h, input.cc, input.h, interpreter-private.cc, interpreter-private.h, interpreter.cc, interpreter.h, inv.cc, jsondecode.cc, jsonencode.cc, latex-text-renderer.cc, latex-text-renderer.h, load-path.cc, load-path.h, load-save.cc, load-save.h, lookup.cc, ls-hdf5.cc, ls-mat4.cc, ls-mat5.cc, lsode.cc, lu.cc, mappers.cc, matrix_type.cc, max.cc, mex.cc, mexproto.h, mxarray.h, mxtypes.in.h, oct-errno.in.cc, oct-hdf5-types.cc, oct-hist.cc, oct-hist.h, oct-map.cc, oct-map.h, oct-opengl.h, oct-prcstrm.h, oct-process.cc, oct-process.h, oct-stdstrm.h, oct-stream.cc, oct-stream.h, oct-strstrm.h, octave-default-image.h, ordqz.cc, ordschur.cc, pager.cc, pager.h, pinv.cc, pow2.cc, pr-output.cc, psi.cc, qr.cc, quadcc.cc, rand.cc, regexp.cc, settings.cc, settings.h, sighandlers.cc, sighandlers.h, sparse-xpow.cc, sqrtm.cc, stack-frame.cc, stack-frame.h, stream-euler.cc, strfns.cc, svd.cc, syminfo.cc, syminfo.h, symrcm.cc, symrec.cc, symrec.h, symscope.cc, symscope.h, symtab.cc, symtab.h, sysdep.cc, sysdep.h, text-engine.cc, text-engine.h, text-renderer.cc, text-renderer.h, time.cc, toplev.cc, typecast.cc, url-handle-manager.cc, url-handle-manager.h, urlwrite.cc, utils.cc, utils.h, variables.cc, variables.h, xdiv.cc, __delaunayn__.cc, __init_fltk__.cc, __init_gnuplot__.cc, __ode15__.cc, __voronoi__.cc, audioread.cc, convhulln.cc, gzip.cc, cdef-class.cc, cdef-class.h, cdef-fwd.h, cdef-manager.cc, cdef-manager.h, cdef-method.cc, cdef-method.h, cdef-object.cc, cdef-object.h, cdef-package.cc, cdef-package.h, cdef-property.cc, cdef-property.h, cdef-utils.cc, cdef-utils.h, ov-base-diag.cc, ov-base-int.cc, ov-base-mat.cc, ov-base-mat.h, ov-base-scalar.cc, ov-base.cc, ov-base.h, ov-bool-mat.cc, ov-bool-mat.h, ov-bool-sparse.cc, ov-bool.cc, ov-builtin.h, ov-cell.cc, ov-ch-mat.cc, ov-class.cc, ov-class.h, ov-classdef.cc, ov-classdef.h, ov-complex.cc, ov-cx-diag.cc, ov-cx-mat.cc, ov-cx-sparse.cc, ov-dld-fcn.cc, ov-dld-fcn.h, ov-fcn-handle.cc, ov-fcn-handle.h, ov-fcn.h, ov-float.cc, ov-flt-complex.cc, ov-flt-cx-diag.cc, ov-flt-cx-mat.cc, ov-flt-re-diag.cc, ov-flt-re-mat.cc, ov-flt-re-mat.h, ov-intx.h, ov-java.cc, ov-lazy-idx.cc, ov-legacy-range.cc, ov-magic-int.cc, ov-mex-fcn.cc, ov-mex-fcn.h, ov-null-mat.cc, ov-perm.cc, ov-range.cc, ov-re-diag.cc, ov-re-mat.cc, ov-re-mat.h, ov-re-sparse.cc, ov-scalar.cc, ov-str-mat.cc, ov-struct.cc, ov-typeinfo.cc, ov-typeinfo.h, ov-usr-fcn.cc, ov-usr-fcn.h, ov.cc, ov.h, ovl.h, octave.cc, octave.h, op-b-sbm.cc, op-bm-sbm.cc, op-cs-scm.cc, op-fm-fcm.cc, op-fs-fcm.cc, op-s-scm.cc, op-scm-cs.cc, op-scm-s.cc, op-sm-cs.cc, ops.h, anon-fcn-validator.cc, anon-fcn-validator.h, bp-table.cc, bp-table.h, comment-list.cc, comment-list.h, filepos.h, lex.h, oct-lvalue.cc, oct-lvalue.h, parse.h, profiler.cc, profiler.h, pt-anon-scopes.cc, pt-anon-scopes.h, pt-arg-list.cc, pt-arg-list.h, pt-args-block.cc, pt-args-block.h, pt-array-list.cc, pt-array-list.h, pt-assign.cc, pt-assign.h, pt-binop.cc, pt-binop.h, pt-bp.cc, pt-bp.h, pt-cbinop.cc, pt-cbinop.h, pt-cell.cc, pt-cell.h, pt-check.cc, pt-check.h, pt-classdef.cc, pt-classdef.h, pt-cmd.h, pt-colon.cc, pt-colon.h, pt-const.cc, pt-const.h, pt-decl.cc, pt-decl.h, pt-eval.cc, pt-eval.h, pt-except.cc, pt-except.h, pt-exp.cc, pt-exp.h, pt-fcn-handle.cc, pt-fcn-handle.h, pt-id.cc, pt-id.h, pt-idx.cc, pt-idx.h, pt-jump.h, pt-loop.cc, pt-loop.h, pt-mat.cc, pt-mat.h, pt-misc.cc, pt-misc.h, pt-pr-code.cc, pt-pr-code.h, pt-select.cc, pt-select.h, pt-spmd.cc, pt-spmd.h, pt-stmt.cc, pt-stmt.h, pt-tm-const.cc, pt-tm-const.h, pt-unop.cc, pt-unop.h, pt-walk.cc, pt-walk.h, pt.cc, pt.h, token.cc, token.h, Range.cc, Range.h, idx-vector.cc, idx-vector.h, range-fwd.h, CollocWt.cc, CollocWt.h, aepbalance.cc, aepbalance.h, chol.cc, chol.h, gepbalance.cc, gepbalance.h, gsvd.cc, gsvd.h, hess.cc, hess.h, lo-mappers.cc, lo-mappers.h, lo-specfun.cc, lo-specfun.h, lu.cc, lu.h, oct-convn.cc, oct-convn.h, oct-fftw.cc, oct-fftw.h, oct-norm.cc, oct-norm.h, oct-rand.cc, oct-rand.h, oct-spparms.cc, oct-spparms.h, qr.cc, qr.h, qrp.cc, qrp.h, randgamma.cc, randgamma.h, randmtzig.cc, randmtzig.h, randpoisson.cc, randpoisson.h, schur.cc, schur.h, sparse-chol.cc, sparse-chol.h, sparse-lu.cc, sparse-lu.h, sparse-qr.cc, sparse-qr.h, svd.cc, svd.h, child-list.cc, child-list.h, dir-ops.cc, dir-ops.h, file-ops.cc, file-ops.h, file-stat.cc, file-stat.h, lo-sysdep.cc, lo-sysdep.h, lo-sysinfo.cc, lo-sysinfo.h, mach-info.cc, mach-info.h, oct-env.cc, oct-env.h, oct-group.cc, oct-group.h, oct-password.cc, oct-password.h, oct-syscalls.cc, oct-syscalls.h, oct-time.cc, oct-time.h, oct-uname.cc, oct-uname.h, action-container.cc, action-container.h, base-list.h, cmd-edit.cc, cmd-edit.h, cmd-hist.cc, cmd-hist.h, f77-fcn.h, file-info.cc, file-info.h, lo-array-errwarn.cc, lo-array-errwarn.h, lo-hash.cc, lo-hash.h, lo-ieee.h, lo-regexp.cc, lo-regexp.h, lo-utils.cc, lo-utils.h, oct-base64.cc, oct-base64.h, oct-glob.cc, oct-glob.h, oct-inttypes.h, oct-mutex.cc, oct-mutex.h, oct-refcount.h, oct-shlib.cc, oct-shlib.h, oct-sparse.cc, oct-sparse.h, oct-string.h, octave-preserve-stream-state.h, pathsearch.cc, pathsearch.h, quit.cc, quit.h, unwind-prot.cc, unwind-prot.h, url-transfer.cc, url-transfer.h: Re-indent code after switch to using namespace macros.
author Rik <rik@octave.org>
date Thu, 01 Dec 2022 18:02:15 -0800
parents e88a07dec498
children 597f3ee61a48
comparison
equal deleted inserted replaced
31605:e88a07dec498 31607:aac27ad79be6
39 // FIXME: We could maybe re-think the naming of some of these objects 39 // FIXME: We could maybe re-think the naming of some of these objects
40 // before releasing a version that contains these new classes... 40 // before releasing a version that contains these new classes...
41 41
42 OCTAVE_BEGIN_NAMESPACE(octave) 42 OCTAVE_BEGIN_NAMESPACE(octave)
43 43
44 class tree_arg_size_spec 44 class tree_arg_size_spec
45 { 45 {
46 public: 46 public:
47 47
48 tree_arg_size_spec (tree_argument_list *size_args) 48 tree_arg_size_spec (tree_argument_list *size_args)
49 : m_size_args (size_args) 49 : m_size_args (size_args)
50 { } 50 { }
51 51
52 // No copying! 52 // No copying!
53 53
54 tree_arg_size_spec (const tree_arg_size_spec&) = delete; 54 tree_arg_size_spec (const tree_arg_size_spec&) = delete;
55 55
56 tree_arg_size_spec& operator = (const tree_arg_size_spec&) = delete; 56 tree_arg_size_spec& operator = (const tree_arg_size_spec&) = delete;
57 57
58 ~tree_arg_size_spec (void) 58 ~tree_arg_size_spec (void)
59 { 59 {
60 delete m_size_args; 60 delete m_size_args;
61 } 61 }
62 62
63 tree_argument_list * size_args (void) { return m_size_args; } 63 tree_argument_list * size_args (void) { return m_size_args; }
64 64
65 void accept (tree_walker& tw) 65 void accept (tree_walker& tw)
66 { 66 {
67 tw.visit_arg_size_spec (*this); 67 tw.visit_arg_size_spec (*this);
68 } 68 }
69 69
70 private: 70 private:
71 71
72 tree_argument_list *m_size_args; 72 tree_argument_list *m_size_args;
73 }; 73 };
74 74
75 class tree_arg_validation_fcns 75 class tree_arg_validation_fcns
76 { 76 {
77 public: 77 public:
78 78
79 tree_arg_validation_fcns (tree_argument_list *fcn_args) 79 tree_arg_validation_fcns (tree_argument_list *fcn_args)
80 : m_fcn_args (fcn_args) 80 : m_fcn_args (fcn_args)
81 { } 81 { }
82 82
83 // No copying! 83 // No copying!
84 84
85 tree_arg_validation_fcns (const tree_arg_validation_fcns&) = delete; 85 tree_arg_validation_fcns (const tree_arg_validation_fcns&) = delete;
86 86
87 tree_arg_validation_fcns& operator = (const tree_arg_validation_fcns&) = delete; 87 tree_arg_validation_fcns& operator = (const tree_arg_validation_fcns&) = delete;
88 88
89 ~tree_arg_validation_fcns (void) 89 ~tree_arg_validation_fcns (void)
90 { 90 {
91 delete m_fcn_args; 91 delete m_fcn_args;
92 } 92 }
93 93
94 tree_argument_list * fcn_args (void) { return m_fcn_args; } 94 tree_argument_list * fcn_args (void) { return m_fcn_args; }
95 95
96 void accept (tree_walker& tw) 96 void accept (tree_walker& tw)
97 { 97 {
98 tw.visit_arg_validation_fcns (*this); 98 tw.visit_arg_validation_fcns (*this);
99 } 99 }
100 100
101 private: 101 private:
102 102
103 tree_argument_list *m_fcn_args; 103 tree_argument_list *m_fcn_args;
104 }; 104 };
105 105
106 class tree_arg_validation 106 class tree_arg_validation
107 { 107 {
108 public: 108 public:
109 109
110 tree_arg_validation (tree_arg_size_spec *size_spec, 110 tree_arg_validation (tree_arg_size_spec *size_spec,
111 tree_identifier *class_name, 111 tree_identifier *class_name,
112 tree_arg_validation_fcns *validation_fcns, 112 tree_arg_validation_fcns *validation_fcns,
113 tree_expression *default_value) 113 tree_expression *default_value)
114 : m_arg_name (nullptr), m_size_spec (size_spec), 114 : m_arg_name (nullptr), m_size_spec (size_spec),
115 m_class_name (class_name), m_validation_fcns (validation_fcns), 115 m_class_name (class_name), m_validation_fcns (validation_fcns),
116 m_default_value (default_value) 116 m_default_value (default_value)
117 { } 117 { }
118 118
119 // No copying! 119 // No copying!
120 120
121 tree_arg_validation (const tree_arg_validation&) = delete; 121 tree_arg_validation (const tree_arg_validation&) = delete;
122 122
123 tree_arg_validation& operator = (const tree_arg_validation&) = delete; 123 tree_arg_validation& operator = (const tree_arg_validation&) = delete;
124 124
125 ~tree_arg_validation (void) 125 ~tree_arg_validation (void)
126 { 126 {
127 delete m_arg_name; 127 delete m_arg_name;
128 delete m_size_spec; 128 delete m_size_spec;
129 delete m_class_name; 129 delete m_class_name;
130 delete m_validation_fcns; 130 delete m_validation_fcns;
131 delete m_default_value; 131 delete m_default_value;
132 } 132 }
133 133
134 void arg_name (tree_expression *name) 134 void arg_name (tree_expression *name)
135 { 135 {
136 m_arg_name = name; 136 m_arg_name = name;
137 } 137 }
138 138
139 tree_expression * identifier_expression (void) { return m_arg_name; } 139 tree_expression * identifier_expression (void) { return m_arg_name; }
140 140
141 tree_arg_size_spec * size_spec (void) { return m_size_spec; } 141 tree_arg_size_spec * size_spec (void) { return m_size_spec; }
142 142
143 tree_identifier * class_name (void) { return m_class_name; } 143 tree_identifier * class_name (void) { return m_class_name; }
144 144
145 tree_arg_validation_fcns * 145 tree_arg_validation_fcns *
146 validation_fcns (void) { return m_validation_fcns; } 146 validation_fcns (void) { return m_validation_fcns; }
147 147
148 tree_expression * 148 tree_expression *
149 initializer_expression (void) { return m_default_value; } 149 initializer_expression (void) { return m_default_value; }
150 150
151 void accept (tree_walker& tw) 151 void accept (tree_walker& tw)
152 { 152 {
153 tw.visit_arg_validation (*this); 153 tw.visit_arg_validation (*this);
154 } 154 }
155 155
156 private: 156 private:
157 157
158 // May be a simple identifier or an identifier followed by a single 158 // May be a simple identifier or an identifier followed by a single
159 // field name. 159 // field name.
160 tree_expression *m_arg_name; 160 tree_expression *m_arg_name;
161 tree_arg_size_spec *m_size_spec; 161 tree_arg_size_spec *m_size_spec;
162 tree_identifier *m_class_name; 162 tree_identifier *m_class_name;
163 tree_arg_validation_fcns *m_validation_fcns; 163 tree_arg_validation_fcns *m_validation_fcns;
164 tree_expression *m_default_value; 164 tree_expression *m_default_value;
165 }; 165 };
166 166
167 class tree_args_block_validation_list 167 class tree_args_block_validation_list
168 : public base_list<tree_arg_validation *> 168 : public base_list<tree_arg_validation *>
169 { 169 {
170 public: 170 public:
171 171
172 tree_args_block_validation_list (void) { } 172 tree_args_block_validation_list (void) { }
173 173
174 tree_args_block_validation_list (tree_arg_validation *a) { append (a); } 174 tree_args_block_validation_list (tree_arg_validation *a) { append (a); }
175 175
176 tree_args_block_validation_list (const base_list<tree_arg_validation *>& a) 176 tree_args_block_validation_list (const base_list<tree_arg_validation *>& a)
177 : base_list<tree_arg_validation *> (a) 177 : base_list<tree_arg_validation *> (a)
178 { } 178 { }
179 179
180 // No copying! 180 // No copying!
181 181
182 tree_args_block_validation_list (const tree_args_block_validation_list&) = delete; 182 tree_args_block_validation_list (const tree_args_block_validation_list&) = delete;
183 183
184 tree_args_block_validation_list& operator = (const tree_args_block_validation_list&) = delete; 184 tree_args_block_validation_list& operator = (const tree_args_block_validation_list&) = delete;
185 185
186 ~tree_args_block_validation_list (void); 186 ~tree_args_block_validation_list (void);
187 187
188 void accept (tree_walker& tw) 188 void accept (tree_walker& tw)
189 { 189 {
190 tw.visit_args_block_validation_list (*this); 190 tw.visit_args_block_validation_list (*this);
191 } 191 }
192 }; 192 };
193 193
194 // FIXME: Maybe make this object an actual list even though we don't 194 // FIXME: Maybe make this object an actual list even though we don't
195 // currently need it? 195 // currently need it?
196 196
197 class tree_args_block_attribute_list 197 class tree_args_block_attribute_list
198 { 198 {
199 public: 199 public:
200 200
201 tree_args_block_attribute_list (tree_identifier *attr = nullptr) 201 tree_args_block_attribute_list (tree_identifier *attr = nullptr)
202 : m_attr (attr) 202 : m_attr (attr)
203 { } 203 { }
204 204
205 // No copying! 205 // No copying!
206 206
207 tree_args_block_attribute_list (const tree_args_block_attribute_list&) = delete; 207 tree_args_block_attribute_list (const tree_args_block_attribute_list&) = delete;
208 208
209 tree_args_block_attribute_list& operator = (const tree_args_block_attribute_list&) = delete; 209 tree_args_block_attribute_list& operator = (const tree_args_block_attribute_list&) = delete;
210 210
211 ~tree_args_block_attribute_list (void) 211 ~tree_args_block_attribute_list (void)
212 { 212 {
213 delete m_attr; 213 delete m_attr;
214 } 214 }
215 215
216 tree_identifier * attribute (void) { return m_attr; } 216 tree_identifier * attribute (void) { return m_attr; }
217 217
218 void accept (tree_walker& tw) 218 void accept (tree_walker& tw)
219 { 219 {
220 tw.visit_args_block_attribute_list (*this); 220 tw.visit_args_block_attribute_list (*this);
221 } 221 }
222 222
223 private: 223 private:
224 224
225 tree_identifier *m_attr; 225 tree_identifier *m_attr;
226 }; 226 };
227 227
228 // Arguments block. 228 // Arguments block.
229 229
230 class tree_arguments_block : public tree_command 230 class tree_arguments_block : public tree_command
231 { 231 {
232 public: 232 public:
233 233
234 tree_arguments_block (tree_args_block_attribute_list *attr_list, 234 tree_arguments_block (tree_args_block_attribute_list *attr_list,
235 tree_args_block_validation_list *validation_list, 235 tree_args_block_validation_list *validation_list,
236 int l = -1, int c = -1) 236 int l = -1, int c = -1)
237 : tree_command (l, c), m_attr_list (attr_list), 237 : tree_command (l, c), m_attr_list (attr_list),
238 m_validation_list (validation_list), 238 m_validation_list (validation_list),
239 m_lead_comm (nullptr), m_trail_comm (nullptr) 239 m_lead_comm (nullptr), m_trail_comm (nullptr)
240 { } 240 { }
241 241
242 // No copying! 242 // No copying!
243 243
244 tree_arguments_block (const tree_arguments_block&) = delete; 244 tree_arguments_block (const tree_arguments_block&) = delete;
245 245
246 tree_arguments_block& operator = (const tree_arguments_block&) = delete; 246 tree_arguments_block& operator = (const tree_arguments_block&) = delete;
247 247
248 ~tree_arguments_block (void) 248 ~tree_arguments_block (void)
249 { 249 {
250 delete m_attr_list; 250 delete m_attr_list;
251 delete m_validation_list; 251 delete m_validation_list;
252 252
253 delete m_lead_comm; 253 delete m_lead_comm;
254 delete m_trail_comm; 254 delete m_trail_comm;
255 } 255 }
256 256
257 tree_args_block_attribute_list * attribute_list (void) 257 tree_args_block_attribute_list * attribute_list (void)
258 { 258 {
259 return m_attr_list; 259 return m_attr_list;
260 } 260 }
261 261
262 tree_args_block_validation_list * validation_list (void) 262 tree_args_block_validation_list * validation_list (void)
263 { 263 {
264 return m_validation_list; 264 return m_validation_list;
265 } 265 }
266 266
267 comment_list * leading_comment (void) { return m_lead_comm; } 267 comment_list * leading_comment (void) { return m_lead_comm; }
268 268
269 comment_list * trailing_comment (void) { return m_trail_comm; } 269 comment_list * trailing_comment (void) { return m_trail_comm; }
270 270
271 void accept (tree_walker& tw) 271 void accept (tree_walker& tw)
272 { 272 {
273 tw.visit_arguments_block (*this); 273 tw.visit_arguments_block (*this);
274 } 274 }
275 275
276 private: 276 private:
277 277
278 tree_args_block_attribute_list *m_attr_list; 278 tree_args_block_attribute_list *m_attr_list;
279 279
280 tree_args_block_validation_list *m_validation_list; 280 tree_args_block_validation_list *m_validation_list;
281 281
282 // Comment preceding ARGUMENTS token. 282 // Comment preceding ARGUMENTS token.
283 comment_list *m_lead_comm; 283 comment_list *m_lead_comm;
284 284
285 // Comment preceding ENDARGUMENTS token. 285 // Comment preceding ENDARGUMENTS token.
286 comment_list *m_trail_comm; 286 comment_list *m_trail_comm;
287 }; 287 };
288 288
289 OCTAVE_END_NAMESPACE(octave) 289 OCTAVE_END_NAMESPACE(octave)
290 290
291 #endif 291 #endif