Mercurial > octave
annotate liboctave/util/base-list.h @ 16627:de91b1621260
adjust location of eof marker for files with subfunctions but no explicit end statements
* ov-fcn.h (octave_function::maybe_relocate_end,
octave_function::has_subfunctions,
octave_function::stash_subfunction_names,
octave_function::subfunction_names): New virtual functions.
* ov-usr-fcn.h, ov-usr-fcn.cc (octave_user_function::end_location_line,
octave_user_function::end_location_column,
octave_user_function::subfcn_names): New member variables.
(octave_user_function::beginning_line,
octave_user_function::beginning_column,
octave_user_function::stash_fcn_end_location,
octave_user_function::ending_line,
octave_user_function::ending_column,
octave_user_function::has_subfunctions,
octave_user_function::subfunction_names,
octave_user_function::stash_subfunction_names,
octave_user_function::maybe_relocate_end_internal,
octave_user_function::maybe_relocate_end): New functions.
* oct-parse.in.yy (FCN): Declare as token with tok_val type.
(function_beg): Declare as tok_val type. Return FCN value.
(function): Move stash_comment here from function_beg. Pass line and
column info to parser.finish_function.
(octave_base_parser::subfunction_names): New data member.
(octave_base_parser::reset): Clear subfuntction_names.
(octave_base_parser::start_function): Call stash_fcn_end_location.
(octave_base_parser::frob_function): Don't call stash_fcn_location.
(octave_base_parser_::finish_function): Call stash_fcn_location.
Append name to subfunction_names.
Call maybe_relocate_end on constructed function.
(parse_fcn_file): Attach subfunction names to primary function.
* pt-stmt.h, pt-stmt.cc (tree_statement::set_location): New function.
* pt.h (tree::set_location): New function.
* pt-cmd.h, pt-cmd.cc (tree_no_op_command::tree_no_op_command): Use
EOF member variable to track auto-generated end statements that appear
at the end of file. Change all callers.
(tree_command::is_end_of_file): New function.
* pt-stmt.h, pt-stmt.cc (tree_statement::set_location,
tree_statement::is_end_of_file): New functions.
* base-list.h (octave_base_list::reverse_iterator,
octave_base_list::const_reverse_iterator): New typedefs.
(octave_base_list::rbegin, octave_base_list::rend): New functions.
* debug.h, debug.cc (bp_table::do_add_breakpoint):
Handle subfunctions.
(bp_table::do_remove_breakpoint_1): New function.
(bp_table::do_remove_breakpoint): Use it. Handle subfunctions.
(bp_table::do_remove_all_breakpoints_in_file_1): New function.
(bp_table::do_remove_all_breakpoints_in_file): Use it. Handle
subfunctions.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Tue, 07 May 2013 15:29:00 -0400 |
| parents | 70f465930546 |
| children | 856cb7cba231 81f3b09e3e6e |
| rev | line source |
|---|---|
| 4222 | 1 /* |
| 2 | |
|
14138
72c96de7a403
maint: update copyright notices for 2012
John W. Eaton <jwe@octave.org>
parents:
14030
diff
changeset
|
3 Copyright (C) 2002-2012 John W. Eaton |
| 4222 | 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. | |
| 4222 | 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/>. | |
| 4222 | 20 |
| 21 */ | |
| 22 | |
| 23 #if !defined (octave_base_list_h) | |
| 24 #define octave_base_list_h 1 | |
| 25 | |
|
16237
70f465930546
rearrange class heirarchy for tree_cell and tree_matrix
John W. Eaton <jwe@octave.org>
parents:
15271
diff
changeset
|
26 #include <cstdlib> |
|
70f465930546
rearrange class heirarchy for tree_cell and tree_matrix
John W. Eaton <jwe@octave.org>
parents:
15271
diff
changeset
|
27 |
| 4222 | 28 #include <list> |
| 29 | |
| 30 template <typename elt_type> | |
| 31 class | |
| 32 octave_base_list | |
| 33 { | |
| 34 public: | |
| 35 | |
| 36 typedef typename std::list<elt_type>::iterator iterator; | |
| 37 typedef typename std::list<elt_type>::const_iterator const_iterator; | |
| 38 | |
|
16627
de91b1621260
adjust location of eof marker for files with subfunctions but no explicit end statements
John W. Eaton <jwe@octave.org>
parents:
16237
diff
changeset
|
39 typedef typename std::list<elt_type>::reverse_iterator reverse_iterator; |
|
de91b1621260
adjust location of eof marker for files with subfunctions but no explicit end statements
John W. Eaton <jwe@octave.org>
parents:
16237
diff
changeset
|
40 typedef typename std::list<elt_type>::const_reverse_iterator const_reverse_iterator; |
|
de91b1621260
adjust location of eof marker for files with subfunctions but no explicit end statements
John W. Eaton <jwe@octave.org>
parents:
16237
diff
changeset
|
41 |
| 4222 | 42 bool empty (void) const { return lst.empty (); } |
| 43 | |
|
14023
d51b321b5fef
move base-list.h from src to liboctave
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
44 size_t size (void) const { return lst.size (); } |
|
d51b321b5fef
move base-list.h from src to liboctave
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
45 size_t length (void) const { return size (); } |
| 4222 | 46 |
| 47 iterator erase (iterator pos) { return lst.erase (pos); } | |
| 48 | |
| 5142 | 49 template <class P> |
| 6841 | 50 void remove_if (P pred) |
| 51 { | |
| 52 // We would like to simply call | |
| 53 // | |
| 54 // lst.remove_if (pred); | |
| 55 // | |
| 56 // but the Sun Studio compiler chokes on that. | |
| 57 // | |
| 58 // FIXME -- this kluge should be removed at some point. | |
| 59 | |
| 60 iterator b = lst.begin (); | |
| 61 iterator e = lst.end (); | |
| 62 while (b != e) | |
| 63 { | |
| 10313 | 64 iterator n = b; |
| 65 n++; | |
| 66 if (pred (*b)) | |
| 67 lst.erase (b); | |
| 68 b = n; | |
| 6841 | 69 } |
| 70 } | |
| 5142 | 71 |
| 4222 | 72 void clear (void) { lst.clear (); } |
| 73 | |
| 74 iterator begin (void) { return iterator (lst.begin ()); } | |
| 75 const_iterator begin (void) const { return const_iterator (lst.begin ()); } | |
| 76 | |
| 77 iterator end (void) { return iterator (lst.end ()); } | |
| 78 const_iterator end (void) const { return const_iterator (lst.end ()); } | |
| 79 | |
|
16627
de91b1621260
adjust location of eof marker for files with subfunctions but no explicit end statements
John W. Eaton <jwe@octave.org>
parents:
16237
diff
changeset
|
80 reverse_iterator rbegin (void) { return reverse_iterator (lst.rbegin ()); } |
|
de91b1621260
adjust location of eof marker for files with subfunctions but no explicit end statements
John W. Eaton <jwe@octave.org>
parents:
16237
diff
changeset
|
81 const_reverse_iterator rbegin (void) const { return const_reverse_iterator (lst.rbegin ()); } |
|
de91b1621260
adjust location of eof marker for files with subfunctions but no explicit end statements
John W. Eaton <jwe@octave.org>
parents:
16237
diff
changeset
|
82 |
|
de91b1621260
adjust location of eof marker for files with subfunctions but no explicit end statements
John W. Eaton <jwe@octave.org>
parents:
16237
diff
changeset
|
83 reverse_iterator rend (void) { return reverse_iterator (lst.rend ()); } |
|
de91b1621260
adjust location of eof marker for files with subfunctions but no explicit end statements
John W. Eaton <jwe@octave.org>
parents:
16237
diff
changeset
|
84 const_reverse_iterator rend (void) const { return const_reverse_iterator (lst.rend ()); } |
|
de91b1621260
adjust location of eof marker for files with subfunctions but no explicit end statements
John W. Eaton <jwe@octave.org>
parents:
16237
diff
changeset
|
85 |
| 4222 | 86 elt_type& front (void) { return lst.front (); } |
| 87 elt_type& back (void) { return lst.back (); } | |
| 88 | |
| 89 const elt_type& front (void) const { return lst.front (); } | |
| 90 const elt_type& back (void) const { return lst.back (); } | |
| 91 | |
|
8470
5da39b223f61
base-list.h (push_front, pop_front, push_back, pop_back): new functions.
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
92 void push_front (const elt_type& s) { lst.push_front (s); } |
|
5da39b223f61
base-list.h (push_front, pop_front, push_back, pop_back): new functions.
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
93 void push_back (const elt_type& s) { lst.push_back (s); } |
|
5da39b223f61
base-list.h (push_front, pop_front, push_back, pop_back): new functions.
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
94 |
|
5da39b223f61
base-list.h (push_front, pop_front, push_back, pop_back): new functions.
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
95 void pop_front (void) { lst.pop_front (); } |
|
5da39b223f61
base-list.h (push_front, pop_front, push_back, pop_back): new functions.
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
96 void pop_back (void) { lst.pop_back (); } |
|
5da39b223f61
base-list.h (push_front, pop_front, push_back, pop_back): new functions.
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
97 |
|
5da39b223f61
base-list.h (push_front, pop_front, push_back, pop_back): new functions.
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
98 // For backward compatibility. |
|
5da39b223f61
base-list.h (push_front, pop_front, push_back, pop_back): new functions.
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
99 void append (const elt_type& s) { lst.push_back (s); } |
|
5da39b223f61
base-list.h (push_front, pop_front, push_back, pop_back): new functions.
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
100 |
|
11515
6dbf9bcce90e
more data member initialization fixes
John W. Eaton <jwe@octave.org>
parents:
10313
diff
changeset
|
101 protected: |
|
6dbf9bcce90e
more data member initialization fixes
John W. Eaton <jwe@octave.org>
parents:
10313
diff
changeset
|
102 |
|
6dbf9bcce90e
more data member initialization fixes
John W. Eaton <jwe@octave.org>
parents:
10313
diff
changeset
|
103 octave_base_list (void) : lst () { } |
|
6dbf9bcce90e
more data member initialization fixes
John W. Eaton <jwe@octave.org>
parents:
10313
diff
changeset
|
104 |
|
14023
d51b321b5fef
move base-list.h from src to liboctave
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
105 octave_base_list (const std::list<elt_type>& l) : lst (l) { } |
|
d51b321b5fef
move base-list.h from src to liboctave
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
106 |
|
11515
6dbf9bcce90e
more data member initialization fixes
John W. Eaton <jwe@octave.org>
parents:
10313
diff
changeset
|
107 octave_base_list (const octave_base_list& bl) : lst (bl.lst) { } |
|
6dbf9bcce90e
more data member initialization fixes
John W. Eaton <jwe@octave.org>
parents:
10313
diff
changeset
|
108 |
|
6dbf9bcce90e
more data member initialization fixes
John W. Eaton <jwe@octave.org>
parents:
10313
diff
changeset
|
109 octave_base_list& operator = (const octave_base_list& bl) |
|
6dbf9bcce90e
more data member initialization fixes
John W. Eaton <jwe@octave.org>
parents:
10313
diff
changeset
|
110 { |
|
6dbf9bcce90e
more data member initialization fixes
John W. Eaton <jwe@octave.org>
parents:
10313
diff
changeset
|
111 if (this != &bl) |
|
6dbf9bcce90e
more data member initialization fixes
John W. Eaton <jwe@octave.org>
parents:
10313
diff
changeset
|
112 { |
|
6dbf9bcce90e
more data member initialization fixes
John W. Eaton <jwe@octave.org>
parents:
10313
diff
changeset
|
113 lst = bl.lst; |
|
6dbf9bcce90e
more data member initialization fixes
John W. Eaton <jwe@octave.org>
parents:
10313
diff
changeset
|
114 } |
|
6dbf9bcce90e
more data member initialization fixes
John W. Eaton <jwe@octave.org>
parents:
10313
diff
changeset
|
115 return *this; |
|
6dbf9bcce90e
more data member initialization fixes
John W. Eaton <jwe@octave.org>
parents:
10313
diff
changeset
|
116 } |
|
6dbf9bcce90e
more data member initialization fixes
John W. Eaton <jwe@octave.org>
parents:
10313
diff
changeset
|
117 |
|
6dbf9bcce90e
more data member initialization fixes
John W. Eaton <jwe@octave.org>
parents:
10313
diff
changeset
|
118 ~octave_base_list (void) { } |
|
6dbf9bcce90e
more data member initialization fixes
John W. Eaton <jwe@octave.org>
parents:
10313
diff
changeset
|
119 |
| 4222 | 120 private: |
| 121 | |
| 122 std::list<elt_type> lst; | |
| 123 }; | |
| 124 | |
| 125 #endif |