annotate libinterp/parse-tree/pt-classdef.cc @ 30723:08b08b7f05b2

Replace direct calls to C library assert() with Octave specialty functions in libinterp/ (bug #61753) Define 4 new inline functions in error.h (panic_if, panic_unless, error_if, error_unless) that call either assert() or Octave's own error() function. Replace calls to assert() in code that maintains state and for which no recovery on detection of a problem is possible with calls to panic_XXX. Replace calls to assert() in interpreter code which could simply return to the Octave prompt when a problem is detected with calls to error_XXX. * error.h (panic_if, panic_unless): New functions which eventually call can call assert(). panic_if (COND) calls assert if COND is true. panic_unless (COND) calls assert if COND is false. * error.h (error_if, error_unless): New functions which eventually call can call Octave's error() function. error_if (COND) calls assert if COND is true. error_unless (COND) calls assert if COND is false. * cellfun.cc, daspk.cc, dasrt.cc, dassl.cc, data.cc, dot.cc, error.cc, graphics.cc, kron.cc, mex.cc, oct-map.cc, oct-stream.cc, pr-output.cc, schur.cc, stack-frame.cc, typecast.cc, variables.cc, ov-base.cc, ov-class.cc, ov-fcn-handle.cc, ov-struct.cc, ov-usr-fcn.cc, ov.h, ovl.cc, ops.h, profiler.cc, pt-classdef.cc, pt-eval.cc, pt-idx.cc, pt-pr-code.cc, pt-tm-const.cc, token.cc: Replace direct calls to C library assert() with Octave specialty functions.
author Arun Giridhar <arungiridhar@gmail.com> and Rik <rik@octave.org>
date Mon, 07 Feb 2022 21:47:53 -0800
parents 796f54d4ddbf
children e88a07dec498
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
27923
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
1 ////////////////////////////////////////////////////////////////////////
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
2 //
30564
796f54d4ddbf update Octave Project Developers copyright for the new year
John W. Eaton <jwe@octave.org>
parents: 29729
diff changeset
3 // Copyright (C) 2012-2022 The Octave Project Developers
27923
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
4 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
5 // See the file COPYRIGHT.md in the top-level directory of this
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
6 // distribution or <https://octave.org/copyright/>.
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
7 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
8 // This file is part of Octave.
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
9 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
10 // Octave is free software: you can redistribute it and/or modify it
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
11 // under the terms of the GNU General Public License as published by
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
12 // the Free Software Foundation, either version 3 of the License, or
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
13 // (at your option) any later version.
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
14 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
15 // Octave is distributed in the hope that it will be useful, but
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
16 // WITHOUT ANY WARRANTY; without even the implied warranty of
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
17 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
18 // GNU General Public License for more details.
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
19 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
20 // You should have received a copy of the GNU General Public License
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
21 // along with Octave; see the file COPYING. If not, see
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
22 // <https://www.gnu.org/licenses/>.
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
23 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
24 ////////////////////////////////////////////////////////////////////////
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents:
diff changeset
25
21724
aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef"
John W. Eaton <jwe@octave.org>
parents: 21301
diff changeset
26 #if defined (HAVE_CONFIG_H)
21301
40de9f8f23a6 Use '#include "config.h"' rather than <config.h>.
Rik <rik@octave.org>
parents: 21200
diff changeset
27 # include "config.h"
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents:
diff changeset
28 #endif
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents:
diff changeset
29
28376
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
30 #include <iostream>
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
31
27371
fcaecdbc8d8a don't use visitor pattern for expression evaluation (bug #56752)
John W. Eaton <jwe@octave.org>
parents: 26718
diff changeset
32 #include "ov.h"
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents:
diff changeset
33 #include "ov-classdef.h"
29729
d0ce7260978d also accept validation syntax for classdef properties
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
34 #include "pt-args-block.h"
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents:
diff changeset
35 #include "pt-classdef.h"
27371
fcaecdbc8d8a don't use visitor pattern for expression evaluation (bug #56752)
John W. Eaton <jwe@octave.org>
parents: 26718
diff changeset
36 #include "pt-eval.h"
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents:
diff changeset
37
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
38 namespace octave
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents:
diff changeset
39 {
26686
581d01526b34 eliminate unnecessary tree_funcall class
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
40 tree_superclass_ref *
581d01526b34 eliminate unnecessary tree_funcall class
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
41 tree_superclass_ref::dup (symbol_scope&) const
581d01526b34 eliminate unnecessary tree_funcall class
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
42 {
581d01526b34 eliminate unnecessary tree_funcall class
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
43 tree_superclass_ref *new_scr
26718
9b0335f4bc74 revise naming of the parts of a superclass reference
John W. Eaton <jwe@octave.org>
parents: 26686
diff changeset
44 = new tree_superclass_ref (m_method_name, m_class_name,
26686
581d01526b34 eliminate unnecessary tree_funcall class
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
45 line (), column ());
581d01526b34 eliminate unnecessary tree_funcall class
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
46
581d01526b34 eliminate unnecessary tree_funcall class
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
47 new_scr->copy_base (*this);
581d01526b34 eliminate unnecessary tree_funcall class
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
48
581d01526b34 eliminate unnecessary tree_funcall class
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
49 return new_scr;
581d01526b34 eliminate unnecessary tree_funcall class
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
50 }
581d01526b34 eliminate unnecessary tree_funcall class
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
51
27371
fcaecdbc8d8a don't use visitor pattern for expression evaluation (bug #56752)
John W. Eaton <jwe@octave.org>
parents: 26718
diff changeset
52 octave_value_list
fcaecdbc8d8a don't use visitor pattern for expression evaluation (bug #56752)
John W. Eaton <jwe@octave.org>
parents: 26718
diff changeset
53 tree_superclass_ref::evaluate_n (tree_evaluator& tw, int nargout)
fcaecdbc8d8a don't use visitor pattern for expression evaluation (bug #56752)
John W. Eaton <jwe@octave.org>
parents: 26718
diff changeset
54 {
fcaecdbc8d8a don't use visitor pattern for expression evaluation (bug #56752)
John W. Eaton <jwe@octave.org>
parents: 26718
diff changeset
55 octave_value tmp
fcaecdbc8d8a don't use visitor pattern for expression evaluation (bug #56752)
John W. Eaton <jwe@octave.org>
parents: 26718
diff changeset
56 = octave_classdef::superclass_ref (m_method_name, m_class_name);
fcaecdbc8d8a don't use visitor pattern for expression evaluation (bug #56752)
John W. Eaton <jwe@octave.org>
parents: 26718
diff changeset
57
fcaecdbc8d8a don't use visitor pattern for expression evaluation (bug #56752)
John W. Eaton <jwe@octave.org>
parents: 26718
diff changeset
58 if (! is_postfix_indexed ())
fcaecdbc8d8a don't use visitor pattern for expression evaluation (bug #56752)
John W. Eaton <jwe@octave.org>
parents: 26718
diff changeset
59 {
fcaecdbc8d8a don't use visitor pattern for expression evaluation (bug #56752)
John W. Eaton <jwe@octave.org>
parents: 26718
diff changeset
60 // There was no index, so this superclass_ref object is not
fcaecdbc8d8a don't use visitor pattern for expression evaluation (bug #56752)
John W. Eaton <jwe@octave.org>
parents: 26718
diff changeset
61 // part of an index expression. It is also not an identifier in
fcaecdbc8d8a don't use visitor pattern for expression evaluation (bug #56752)
John W. Eaton <jwe@octave.org>
parents: 26718
diff changeset
62 // the syntax tree but we need to handle it as if it were. So
fcaecdbc8d8a don't use visitor pattern for expression evaluation (bug #56752)
John W. Eaton <jwe@octave.org>
parents: 26718
diff changeset
63 // call the function here.
fcaecdbc8d8a don't use visitor pattern for expression evaluation (bug #56752)
John W. Eaton <jwe@octave.org>
parents: 26718
diff changeset
64 octave_function *f = tmp.function_value (true);
fcaecdbc8d8a don't use visitor pattern for expression evaluation (bug #56752)
John W. Eaton <jwe@octave.org>
parents: 26718
diff changeset
65
30723
08b08b7f05b2 Replace direct calls to C library assert() with Octave specialty functions in libinterp/ (bug #61753)
Arun Giridhar <arungiridhar@gmail.com> and Rik <rik@octave.org>
parents: 30564
diff changeset
66 panic_unless (f);
27371
fcaecdbc8d8a don't use visitor pattern for expression evaluation (bug #56752)
John W. Eaton <jwe@octave.org>
parents: 26718
diff changeset
67
fcaecdbc8d8a don't use visitor pattern for expression evaluation (bug #56752)
John W. Eaton <jwe@octave.org>
parents: 26718
diff changeset
68 return f->call (tw, nargout);
fcaecdbc8d8a don't use visitor pattern for expression evaluation (bug #56752)
John W. Eaton <jwe@octave.org>
parents: 26718
diff changeset
69 }
fcaecdbc8d8a don't use visitor pattern for expression evaluation (bug #56752)
John W. Eaton <jwe@octave.org>
parents: 26718
diff changeset
70
fcaecdbc8d8a don't use visitor pattern for expression evaluation (bug #56752)
John W. Eaton <jwe@octave.org>
parents: 26718
diff changeset
71 // The superclass_ref function object will be indexed as part of the
fcaecdbc8d8a don't use visitor pattern for expression evaluation (bug #56752)
John W. Eaton <jwe@octave.org>
parents: 26718
diff changeset
72 // enclosing index expression.
fcaecdbc8d8a don't use visitor pattern for expression evaluation (bug #56752)
John W. Eaton <jwe@octave.org>
parents: 26718
diff changeset
73
fcaecdbc8d8a don't use visitor pattern for expression evaluation (bug #56752)
John W. Eaton <jwe@octave.org>
parents: 26718
diff changeset
74 return ovl (tmp);
fcaecdbc8d8a don't use visitor pattern for expression evaluation (bug #56752)
John W. Eaton <jwe@octave.org>
parents: 26718
diff changeset
75 }
fcaecdbc8d8a don't use visitor pattern for expression evaluation (bug #56752)
John W. Eaton <jwe@octave.org>
parents: 26718
diff changeset
76
26686
581d01526b34 eliminate unnecessary tree_funcall class
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
77 tree_metaclass_query *
581d01526b34 eliminate unnecessary tree_funcall class
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
78 tree_metaclass_query::dup (symbol_scope&) const
581d01526b34 eliminate unnecessary tree_funcall class
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
79 {
581d01526b34 eliminate unnecessary tree_funcall class
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
80 tree_metaclass_query *new_mcq
581d01526b34 eliminate unnecessary tree_funcall class
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
81 = new tree_metaclass_query (m_class_name, line (), column ());
581d01526b34 eliminate unnecessary tree_funcall class
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
82
581d01526b34 eliminate unnecessary tree_funcall class
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
83 new_mcq->copy_base (*this);
581d01526b34 eliminate unnecessary tree_funcall class
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
84
581d01526b34 eliminate unnecessary tree_funcall class
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
85 return new_mcq;
581d01526b34 eliminate unnecessary tree_funcall class
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
86 }
581d01526b34 eliminate unnecessary tree_funcall class
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
87
27371
fcaecdbc8d8a don't use visitor pattern for expression evaluation (bug #56752)
John W. Eaton <jwe@octave.org>
parents: 26718
diff changeset
88 octave_value
fcaecdbc8d8a don't use visitor pattern for expression evaluation (bug #56752)
John W. Eaton <jwe@octave.org>
parents: 26718
diff changeset
89 tree_metaclass_query::evaluate (tree_evaluator&, int)
fcaecdbc8d8a don't use visitor pattern for expression evaluation (bug #56752)
John W. Eaton <jwe@octave.org>
parents: 26718
diff changeset
90 {
fcaecdbc8d8a don't use visitor pattern for expression evaluation (bug #56752)
John W. Eaton <jwe@octave.org>
parents: 26718
diff changeset
91 return octave_classdef::metaclass_query (m_class_name);
fcaecdbc8d8a don't use visitor pattern for expression evaluation (bug #56752)
John W. Eaton <jwe@octave.org>
parents: 26718
diff changeset
92 }
fcaecdbc8d8a don't use visitor pattern for expression evaluation (bug #56752)
John W. Eaton <jwe@octave.org>
parents: 26718
diff changeset
93
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
94 // Classdef attribute
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
95
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
96 // Classdef attribute_list
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
97
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
98 tree_classdef_attribute_list::~tree_classdef_attribute_list (void)
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
99 {
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
100 while (! empty ())
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
101 {
25337
3ff9192b676e use auto keyword to declare iterator variables where possible
John W. Eaton <jwe@octave.org>
parents: 25054
diff changeset
102 auto p = begin ();
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
103 delete *p;
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
104 erase (p);
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
105 }
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
106 }
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
107
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
108 // Classdef superclass
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents:
diff changeset
109
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
110 // Classdef superclass_list
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents:
diff changeset
111
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
112 tree_classdef_superclass_list::~tree_classdef_superclass_list (void)
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
113 {
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
114 while (! empty ())
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
115 {
25337
3ff9192b676e use auto keyword to declare iterator variables where possible
John W. Eaton <jwe@octave.org>
parents: 25054
diff changeset
116 auto p = begin ();
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
117 delete *p;
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
118 erase (p);
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
119 }
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
120 }
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents:
diff changeset
121
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
122 // Classdef property
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents:
diff changeset
123
28376
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
124 std::string check_for_doc_string (comment_list *comments)
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
125 {
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
126 // If the comment list ends in a block comment or full-line comment,
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
127 // then it is the doc string for this property.
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
128
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
129 if (comments)
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
130 {
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
131 comment_elt last_elt = comments->back ();
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
132
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
133 if (last_elt.is_block () || last_elt.is_full_line ())
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
134 return last_elt.text ();
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
135 }
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
136
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
137 return "";
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
138 }
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
139
29729
d0ce7260978d also accept validation syntax for classdef properties
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
140 tree_classdef_property::tree_classdef_property (tree_arg_validation *av,
28376
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
141 comment_list *comments)
29729
d0ce7260978d also accept validation syntax for classdef properties
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
142 : m_av (av), m_comments (comments),
28376
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
143 m_doc_string (check_for_doc_string (m_comments))
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
144 { }
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
145
29729
d0ce7260978d also accept validation syntax for classdef properties
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
146 tree_classdef_property::~tree_classdef_property (void)
d0ce7260978d also accept validation syntax for classdef properties
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
147 {
d0ce7260978d also accept validation syntax for classdef properties
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
148 delete m_av;
d0ce7260978d also accept validation syntax for classdef properties
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
149 }
d0ce7260978d also accept validation syntax for classdef properties
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
150
d0ce7260978d also accept validation syntax for classdef properties
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
151 tree_identifier * tree_classdef_property::ident (void)
d0ce7260978d also accept validation syntax for classdef properties
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
152 {
d0ce7260978d also accept validation syntax for classdef properties
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
153 tree_expression *id_expr = m_av->identifier_expression ();
d0ce7260978d also accept validation syntax for classdef properties
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
154
d0ce7260978d also accept validation syntax for classdef properties
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
155 return dynamic_cast<tree_identifier *> (id_expr);
d0ce7260978d also accept validation syntax for classdef properties
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
156 }
d0ce7260978d also accept validation syntax for classdef properties
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
157
d0ce7260978d also accept validation syntax for classdef properties
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
158 tree_expression * tree_classdef_property::expression (void)
d0ce7260978d also accept validation syntax for classdef properties
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
159 {
d0ce7260978d also accept validation syntax for classdef properties
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
160 return m_av->initializer_expression ();
d0ce7260978d also accept validation syntax for classdef properties
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
161 }
28376
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
162
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
163 // Classdef property_list
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents:
diff changeset
164
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
165 tree_classdef_property_list::~tree_classdef_property_list (void)
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
166 {
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
167 while (! empty ())
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
168 {
25337
3ff9192b676e use auto keyword to declare iterator variables where possible
John W. Eaton <jwe@octave.org>
parents: 25054
diff changeset
169 auto p = begin ();
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
170 delete *p;
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
171 erase (p);
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
172 }
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
173 }
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
174
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
175 // Classdef properties_block
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents:
diff changeset
176
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
177 // Classdef methods_list
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
178
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
179 // Classdef methods_block
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents:
diff changeset
180
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
181 // Classdef event
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents:
diff changeset
182
28376
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
183 tree_classdef_event::tree_classdef_event (tree_identifier *i,
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
184 comment_list *comments)
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
185 : m_id (i), m_comments (comments),
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
186 m_doc_string (check_for_doc_string (m_comments))
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
187 { }
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
188
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
189 // Classdef events_list
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents:
diff changeset
190
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
191 tree_classdef_events_list::~tree_classdef_events_list (void)
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
192 {
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
193 while (! empty ())
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
194 {
25337
3ff9192b676e use auto keyword to declare iterator variables where possible
John W. Eaton <jwe@octave.org>
parents: 25054
diff changeset
195 auto p = begin ();
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
196 delete *p;
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
197 erase (p);
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
198 }
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
199 }
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
200
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
201 // Classdef events_block
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
202
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
203 // Classdef enum
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents:
diff changeset
204
28376
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
205 tree_classdef_enum::tree_classdef_enum (tree_identifier *i,
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
206 tree_expression *e,
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
207 comment_list *comments)
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
208 : m_id (i), m_expr (e), m_comments (comments),
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
209 m_doc_string (check_for_doc_string (m_comments))
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
210 { }
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
211
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
212 // Classdef enum_list
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents:
diff changeset
213
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
214 tree_classdef_enum_list::~tree_classdef_enum_list (void)
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
215 {
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
216 while (! empty ())
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
217 {
25337
3ff9192b676e use auto keyword to declare iterator variables where possible
John W. Eaton <jwe@octave.org>
parents: 25054
diff changeset
218 auto p = begin ();
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
219 delete *p;
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
220 erase (p);
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
221 }
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
222 }
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
223
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
224 // Classdef enum_block
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
225
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
226 // Classdef body
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
227
28376
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
228 tree_classdef_body::tree_classdef_body (void)
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
229 : m_properties_lst (), m_methods_lst (), m_events_lst (), m_enum_lst ()
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
230 { }
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
231
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
232 tree_classdef_body::tree_classdef_body (tree_classdef_properties_block *pb)
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
233 : m_properties_lst (), m_methods_lst (), m_events_lst (), m_enum_lst (),
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
234 m_doc_string (pb ? get_doc_string (pb->leading_comment ()) : "")
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
235 {
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
236 append (pb);
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
237 }
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
238
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
239 tree_classdef_body::tree_classdef_body (tree_classdef_methods_block *mb)
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
240 : m_properties_lst (), m_methods_lst (), m_events_lst (), m_enum_lst (),
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
241 m_doc_string (mb ? get_doc_string (mb->leading_comment ()) : "")
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
242 {
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
243 append (mb);
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
244 }
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
245
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
246 tree_classdef_body::tree_classdef_body (tree_classdef_events_block *evb)
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
247 : m_properties_lst (), m_methods_lst (), m_events_lst (), m_enum_lst (),
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
248 m_doc_string (evb ? get_doc_string (evb->leading_comment ()) : "")
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
249 {
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
250 append (evb);
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
251 }
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
252
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
253 tree_classdef_body::tree_classdef_body (tree_classdef_enum_block *enb)
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
254 : m_properties_lst (), m_methods_lst (), m_events_lst (), m_enum_lst (),
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
255 m_doc_string (enb ? get_doc_string (enb->leading_comment ()) : "")
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
256 {
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
257 append (enb);
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
258 }
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
259
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
260 tree_classdef_body::~tree_classdef_body (void)
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
261 {
24846
7620f1f5290d use m_ prefix for member variables in parse tree classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
262 while (! m_properties_lst.empty ())
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
263 {
25337
3ff9192b676e use auto keyword to declare iterator variables where possible
John W. Eaton <jwe@octave.org>
parents: 25054
diff changeset
264 auto p = m_properties_lst.begin ();
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
265 delete *p;
24846
7620f1f5290d use m_ prefix for member variables in parse tree classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
266 m_properties_lst.erase (p);
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
267 }
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents:
diff changeset
268
24846
7620f1f5290d use m_ prefix for member variables in parse tree classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
269 while (! m_methods_lst.empty ())
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
270 {
25337
3ff9192b676e use auto keyword to declare iterator variables where possible
John W. Eaton <jwe@octave.org>
parents: 25054
diff changeset
271 auto p = m_methods_lst.begin ();
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
272 delete *p;
24846
7620f1f5290d use m_ prefix for member variables in parse tree classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
273 m_methods_lst.erase (p);
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
274 }
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents:
diff changeset
275
24846
7620f1f5290d use m_ prefix for member variables in parse tree classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
276 while (! m_events_lst.empty ())
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
277 {
25337
3ff9192b676e use auto keyword to declare iterator variables where possible
John W. Eaton <jwe@octave.org>
parents: 25054
diff changeset
278 auto p = m_events_lst.begin ();
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
279 delete *p;
24846
7620f1f5290d use m_ prefix for member variables in parse tree classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
280 m_events_lst.erase (p);
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
281 }
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents:
diff changeset
282
24846
7620f1f5290d use m_ prefix for member variables in parse tree classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
283 while (! m_enum_lst.empty ())
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
284 {
25337
3ff9192b676e use auto keyword to declare iterator variables where possible
John W. Eaton <jwe@octave.org>
parents: 25054
diff changeset
285 auto p = m_enum_lst.begin ();
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
286 delete *p;
24846
7620f1f5290d use m_ prefix for member variables in parse tree classes
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
287 m_enum_lst.erase (p);
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
288 }
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
289 }
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents:
diff changeset
290
28376
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
291 std::string
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
292 tree_classdef_body::get_doc_string (comment_list *comments) const
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
293 {
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
294 // Grab the first comment from the list and use it as the doc string
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
295 // for this classdef body.
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
296
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
297 if (comments)
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
298 {
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
299 comment_elt first_elt = comments->front ();
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
300
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
301 return first_elt.text ();
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
302 }
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
303
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
304 return "";
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
305 }
c74a48d9b8ee capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
306
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
307 // Classdef
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
308
27505
c409d16b7190 eliminate some uses of bare pointers to octave_function objects
John W. Eaton <jwe@octave.org>
parents: 27371
diff changeset
309 octave_value
23533
8edbc923a7dc begin refactoring use of interpreter/evaluator in classdef objects
John W. Eaton <jwe@octave.org>
parents: 23435
diff changeset
310 tree_classdef::make_meta_class (interpreter& interp, bool is_at_folder)
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
311 {
23533
8edbc923a7dc begin refactoring use of interpreter/evaluator in classdef objects
John W. Eaton <jwe@octave.org>
parents: 23435
diff changeset
312 cdef_class cls = cdef_class::make_meta_class (interp, this, is_at_folder);
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
313
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
314 if (cls.ok ())
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
315 return cls.get_constructor_function ();
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents:
diff changeset
316
27505
c409d16b7190 eliminate some uses of bare pointers to octave_function objects
John W. Eaton <jwe@octave.org>
parents: 27371
diff changeset
317 return octave_value ();
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
318 }
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents:
diff changeset
319 }