Mercurial > octave-nkf
annotate src/comment-list.h @ 13983:7dd7cccf0757
clean up memory allocated for singletons before exit
* singleton-cleanup.h, singleton-cleanup.cc: New files.
* liboctave/Makefile.am (INCS, LIBOCTAVE_CXX_SOURCES):
Add them to the lists.
* toplev.cc (clean_up_and_exit): Call singleton_cleanup_list::cleanup.
* debug.h, debug.cc (bp_table::instance_ok): Move definition to
debug.cc.
* coment-list.h (octave_comment_buffer::~octave_comment_buffer):
Define destructor for class.
* ov-typeinfo.h (octave_value_typeinfo::~octave_value_typeinfo):
Likewise.
* cmd-edit.h (command_editor::cleanup_instance): New function.
* cmd-hist.h (command_history::cleanup_instance): New function.
* file-ops.h (file_ops::cleanup_instance): New function.
* mach-info.h (oct_mach_info::cleanup_instance): New function.
* oct-env.h (octave_env::cleanup_instance): New function.
* oct-fftw.h (octave_fftw_planner::cleanup_instance): New function.
* oct-rand.h (octave_rand::cleanup_instance): New function.
* oct-spparms.h (octave_sparse_params::cleanup_instance):
New function.
* pathsearch.h (static_members::cleanup_instance): New function.
* comment-list.h (octave_comment_buffer::cleanup_instance):
New function.
* debug.h (bp_table::cleanup_instance): New function.
* display.h (display_info::cleanup_instance): New function.
* dynamic-ld.cc (octave_shlib_list::cleanup_instance,
octave_mex_file_list::cleanup_instance): New functions.
* dynamic-ld.h (octave_dynamic_loader::cleanup_instance):
New function.
* load-path.h (load_path::cleanup_instance): New function.
* oct-stream.h (octave_stream_list::cleanup_instance): New function.
* ov-typeinfo.h (octave_value_typeinfo::cleanup_instance):
New function.
* pager.h, pager.cc (octave_pager_stream::instance_ok,
octave_pager_stream::cleanup_instance): New functions.
(octave_diary_stream::instance_ok,
octave_diary_stream::cleanup_instance): New functions.
* sighandlers.h (octave_child_list::cleanup_instance): New function.
* toplev.h (octave_call_stack
* pager.cc (octave_pager_stream::stream, octave_diary_stream::stream):
Use instance_ok to create instance.
* toplev.h (octave_call_stack::cleanup_instance): New function.
* cmd-edit.cc (command_editor::instance_ok):
Register cleanup function.
* cmd-hist.cc (command_history::instance_ok): Likewise.
* file-ops.cc (file_ops::instance_ok): Likewise.
* mach-info.cc (oct_mach_info::instance_ok): Likewise.
* oct-env.cc (octave_env::instance_ok): Likewise.
* oct-fftw.cc (octave_fftw_planner::instance_ok): Likewise.
* oct-rand.cc (octave_rand::instance_ok): Likewise.
* oct-spparms.cc (octave_sparse_params::instance_ok): Likewise.
* pathsearch.cc (dir_path::static_members::instance_ok): Likewise.
* comment-list.cc (comment_list::instance_ok): Likewise.
* debug.cc (bp_table::instance_ok): Likewise.
* display.cc (display_info::instance_ok): Likewise.
* dynamic-ld.cc (octave_shlib_list::instance_ok,
octave_mex_file_list::instance_ok, octave_dynamic_loader): Likewise.
* load-path.cc (load_path::instance_ok): Likewise.
* oct-stream.cc (octave_stream_list::instance_ok): Likewise.
* ov-typeinfo.cc (octave_value_typeinfo::instance_ok): Likewise.
* sighandlers.cc (octave_child_list::instance_ok): Likewise.
* symtab.h, symtab.cc (symbol_table::scope_id::create_instance):
New function.
* symtab.h (symbol_table::scope_id::instance_ok): Call create_instance.
* toplev.h, toplev.cc (octave_call_stack::create_instance):
New function.
* toplev.cc (octave_call_stack::instance_ok): Call create_instance.
* pager.h, pager.cc (octave_pager_stream::set_diary_skip,
octave_pager_stream::flush_current_contents_to_diary): Now static.
octave_pager_stream::do_set_diary_skip,
octave_pager_stream::do_flush_current_contents_to_diary):
New functions.
(octave_pager_stream::stream): Return std::ostream&, not
octave_pager_stream&. If instance creation fails, return std::cout.
(octave_diary_stream::stream): Return std::ostream&, not
octave_diary_stream&. If instance creation fails, return std::cout.
(octave_pager_stream::do_reset, octave_diary_stream::do_reset):
Use instance_ok to create instance.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Sat, 03 Dec 2011 04:34:17 -0500 |
| parents | 12df7854fa7c |
| children | 72c96de7a403 |
| rev | line source |
|---|---|
| 3665 | 1 /* |
| 2 | |
| 11523 | 3 Copyright (C) 2000-2011 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, | |
| 45 end_of_line, | |
| 46 doc_string, | |
| 47 copyright | |
| 48 }; | |
| 49 | |
| 50 octave_comment_elt (const std::string& s = std::string (), | |
| 10313 | 51 comment_type t = unknown) |
| 3665 | 52 : txt (s), typ (t) { } |
| 53 | |
| 54 octave_comment_elt (const octave_comment_elt& oc) | |
| 55 : txt (oc.txt), typ (oc.typ) { } | |
| 56 | |
| 57 octave_comment_elt& operator = (const octave_comment_elt& oc) | |
| 58 { | |
| 59 if (this != &oc) | |
| 10313 | 60 { |
| 61 txt = oc.txt; | |
| 62 typ = oc.typ; | |
| 63 } | |
| 3665 | 64 |
| 65 return *this; | |
| 66 } | |
| 67 | |
| 68 std::string text (void) const { return txt; } | |
| 69 | |
| 70 comment_type type (void) const { return typ; } | |
| 71 | |
| 72 ~octave_comment_elt (void) { } | |
| 73 | |
| 74 private: | |
| 75 | |
| 76 // The text of the comment. | |
| 77 std::string txt; | |
| 78 | |
| 79 // The type of comment. | |
| 80 comment_type typ; | |
| 81 }; | |
| 82 | |
| 83 class | |
| 4219 | 84 octave_comment_list : public octave_base_list<octave_comment_elt> |
| 3665 | 85 { |
| 86 public: | |
| 87 | |
| 5861 | 88 octave_comment_list (void) { } |
| 89 | |
| 4219 | 90 void append (const octave_comment_elt& elt) |
| 91 { octave_base_list<octave_comment_elt>::append (elt); } | |
| 3665 | 92 |
| 4212 | 93 void append (const std::string& s, |
| 10313 | 94 octave_comment_elt::comment_type t = octave_comment_elt::unknown) |
| 4219 | 95 { append (octave_comment_elt (s, t)); } |
| 5861 | 96 |
|
8913
35cd375d4bb3
make tree::dup functions const
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
97 octave_comment_list *dup (void) const; |
| 3665 | 98 }; |
| 99 | |
| 100 class | |
| 101 octave_comment_buffer | |
| 102 { | |
| 103 public: | |
| 104 | |
| 105 octave_comment_buffer (void) | |
| 5861 | 106 : comment_list (new octave_comment_list ()) { } |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
107 |
|
13983
7dd7cccf0757
clean up memory allocated for singletons before exit
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
108 ~octave_comment_buffer (void) { delete comment_list; } |
|
7dd7cccf0757
clean up memory allocated for singletons before exit
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
109 |
| 3665 | 110 static bool instance_ok (void); |
| 111 | |
| 112 static void append | |
| 113 (const std::string& s, | |
| 114 octave_comment_elt::comment_type t = octave_comment_elt::unknown); | |
| 115 | |
| 116 static octave_comment_list *get_comment (void); | |
| 117 | |
| 118 private: | |
| 119 | |
| 120 void do_append (const std::string& s, octave_comment_elt::comment_type t); | |
| 121 | |
| 122 octave_comment_list *do_get_comment (void); | |
| 123 | |
| 124 octave_comment_list *comment_list; | |
| 125 | |
| 126 static octave_comment_buffer *instance; | |
|
13983
7dd7cccf0757
clean up memory allocated for singletons before exit
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
127 |
|
7dd7cccf0757
clean up memory allocated for singletons before exit
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
128 static void cleanup_instance (void) { delete instance; instance = 0; } |
| 3665 | 129 }; |
| 130 | |
| 131 #endif |