Mercurial > octave
view liboctave/cmd-hist.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 | 60b6b175f88a |
children | 72c96de7a403 |
line wrap: on
line source
/* Copyright (C) 1996-2011 John W. Eaton This file is part of Octave. Octave is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. Octave is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with Octave; see the file COPYING. If not, see <http://www.gnu.org/licenses/>. */ #if !defined (octave_cmd_hist_h) #define octave_cmd_hist_h 1 #include <string> #include "str-vec.h" class OCTAVE_API command_history { protected: command_history (void) : initialized (false), ignoring_additions (false), history_control (0), lines_in_file (0), lines_this_session (0), xfile (), xsize (-1) { } public: virtual ~command_history (void) { } static void initialize (bool, const std::string&, int, const std::string&); static bool is_initialized (void); static void set_file (const std::string&); static std::string file (void); static void process_histcontrol (const std::string&); static std::string histcontrol (void); static void set_size (int); static int size (void); static void ignore_entries (bool = true); static bool ignoring_entries (void); static void add (const std::string&); static void remove (int); static int where (void); static int length (void); static int max_input_history (void); static int base (void); static int current_number (void); static void stifle (int); static int unstifle (void); static int is_stifled (void); static void set_mark (int n); // Gag. This declaration has to match the Function typedef in // readline.h. static int goto_mark (void); static void read (bool = true); static void read (const std::string&, bool = true); static void read_range (int = -1, int = -1, bool = true); static void read_range (const std::string&, int = -1, int = -1, bool = true); static void write (const std::string& = std::string ()); static void append (const std::string& = std::string ()); static void truncate_file (const std::string& = std::string (), int = -1); static string_vector list (int = -1, bool = false); static std::string get_entry (int); static void replace_entry (int, const std::string&); static void clean_up_and_save (const std::string& = std::string (), int = -1); private: // No copying! command_history (const command_history&); command_history& operator = (const command_history&); static bool instance_ok (void); static void make_command_history (void); // The real thing. static command_history *instance; static void cleanup_instance (void) { delete instance; instance = 0; } protected: // To use something other than the GNU history library, derive a new // class from command_history, overload these functions as // necessary, and make instance point to the new class. virtual void do_set_file (const std::string&); virtual std::string do_file (void); virtual void do_process_histcontrol (const std::string&); virtual std::string do_histcontrol (void) const { return std::string (); } virtual void do_initialize (bool, const std::string&, int, const std::string&); virtual bool do_is_initialized (void) const; virtual void do_set_size (int); virtual int do_size (void) const; virtual void do_ignore_entries (bool); virtual bool do_ignoring_entries (void) const; virtual void do_add (const std::string&); virtual void do_remove (int); virtual int do_where (void) const; virtual int do_length (void) const; virtual int do_max_input_history (void) const; virtual int do_base (void) const; virtual int do_current_number (void) const; virtual void do_stifle (int); virtual int do_unstifle (void); virtual int do_is_stifled (void) const; virtual void do_set_mark (int); virtual int do_goto_mark (void); virtual void do_read (const std::string&, bool); virtual void do_read_range (const std::string&, int, int, bool); virtual void do_write (const std::string&) const; virtual void do_append (const std::string&); virtual void do_truncate_file (const std::string&, int) const; virtual string_vector do_list (int, bool) const; virtual std::string do_get_entry (int) const; virtual void do_replace_entry (int, const std::string&); virtual void do_clean_up_and_save (const std::string&, int); void error (int) const; void error (const std::string&) const; // TRUE means we have initialized the history file name and number of // lines to save. bool initialized; // TRUE means we are ignoring new additions. bool ignoring_additions; // Bitmask for history control options. See oct-rl-hist.h. int history_control; // The number of history lines we read from the history file. int lines_in_file; // The number of history lines we've saved so far. int lines_this_session; // The default history file. std::string xfile; // The number of lines of history to save. int xsize; }; #endif