Mercurial > octave
annotate libinterp/corefcn/comment-list.h @ 17693:efbe746f8fa8
eliminate octave_comment_buffer singleton
* lex.h (octave_base_lexer::comment_buffer): New class adapted from
octave_comment_buffer class. No longer a singleton class.
(octave_base_lexer::comment_buffer::reset): New function.
(octave_base_lexer::reset): Call comment_buf.reset.
(octave_base_lexer::comment_buf): New data member.
(octave_base_lexer::get_comment): New function.
* comment-list.h, comment-list.cc (octave_comment_buffer): Delete.
Change all uses of octave_comment_buffer to use local comment_buf
object instead.
* parse.h (octave_base_parser::make_statement): New member function.
* oct-parse.in.yy (make_statement): Delete.
Change all uses of make_statement to use the member function instead.
(safe_fclose): Don't extract and delete comment list here.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Fri, 18 Oct 2013 21:00:33 -0400 |
| parents | 68fc671a9339 |
| children | d63878346099 |
| rev | line source |
|---|---|
| 3665 | 1 /* |
| 2 | |
|
14138
72c96de7a403
maint: update copyright notices for 2012
John W. Eaton <jwe@octave.org>
parents:
13983
diff
changeset
|
3 Copyright (C) 2000-2012 John W. Eaton |
| 3665 | 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. | |
| 3665 | 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/>. | |
| 3665 | 20 |
| 21 */ | |
| 22 | |
| 23 #if !defined (octave_comment_list_h) | |
| 24 #define octave_comment_list_h 1 | |
| 25 | |
| 26 #include <string> | |
| 27 | |
| 4219 | 28 #include <base-list.h> |
| 3665 | 29 |
| 30 extern std::string get_comment_text (void); | |
| 31 | |
| 32 extern char *get_comment_text_c_str (void); | |
| 33 | |
| 34 extern void save_comment_text (const std::string& text); | |
| 35 | |
| 36 class | |
| 37 octave_comment_elt | |
| 38 { | |
| 39 public: | |
| 40 | |
| 41 enum comment_type | |
| 42 { | |
| 43 unknown, | |
| 44 block, | |
|
16228
e19b1632d7c1
revamp most comment handling
John W. Eaton <jwe@octave.org>
parents:
15195
diff
changeset
|
45 full_line, |
| 3665 | 46 end_of_line, |
| 47 doc_string, | |
| 48 copyright | |
| 49 }; | |
| 50 | |
| 51 octave_comment_elt (const std::string& s = std::string (), | |
| 10313 | 52 comment_type t = unknown) |
| 3665 | 53 : txt (s), typ (t) { } |
| 54 | |
| 55 octave_comment_elt (const octave_comment_elt& oc) | |
| 56 : txt (oc.txt), typ (oc.typ) { } | |
| 57 | |
| 58 octave_comment_elt& operator = (const octave_comment_elt& oc) | |
| 59 { | |
| 60 if (this != &oc) | |
| 10313 | 61 { |
| 62 txt = oc.txt; | |
| 63 typ = oc.typ; | |
| 64 } | |
| 3665 | 65 |
| 66 return *this; | |
| 67 } | |
| 68 | |
| 69 std::string text (void) const { return txt; } | |
| 70 | |
| 71 comment_type type (void) const { return typ; } | |
| 72 | |
| 73 ~octave_comment_elt (void) { } | |
| 74 | |
| 75 private: | |
| 76 | |
| 77 // The text of the comment. | |
| 78 std::string txt; | |
| 79 | |
| 80 // The type of comment. | |
| 81 comment_type typ; | |
| 82 }; | |
| 83 | |
| 84 class | |
| 4219 | 85 octave_comment_list : public octave_base_list<octave_comment_elt> |
| 3665 | 86 { |
| 87 public: | |
| 88 | |
| 5861 | 89 octave_comment_list (void) { } |
| 90 | |
| 4219 | 91 void append (const octave_comment_elt& elt) |
| 92 { octave_base_list<octave_comment_elt>::append (elt); } | |
| 3665 | 93 |
| 4212 | 94 void append (const std::string& s, |
| 10313 | 95 octave_comment_elt::comment_type t = octave_comment_elt::unknown) |
| 4219 | 96 { append (octave_comment_elt (s, t)); } |
| 5861 | 97 |
|
8913
35cd375d4bb3
make tree::dup functions const
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
98 octave_comment_list *dup (void) const; |
| 3665 | 99 }; |
| 100 | |
| 101 #endif |