Mercurial > hg > octave-nkf
view liboctave/oct-rl-hist.c @ 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 |
line wrap: on
line source
/* Copyright (C) 2000-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/>. */ #ifdef HAVE_CONFIG_H #include <config.h> #endif #include "oct-rl-hist.h" #if defined (USE_READLINE) #include <stdio.h> #include <stdlib.h> #include <string.h> #include <readline/history.h> /* check_history_control, hc_erasedup, and the core of octave_add_history were borrowed from Bash. */ /* Check LINE against what HISTCONTROL says to do. Returns 1 if the line should be saved; 0 if it should be discarded. */ static int check_history_control (const char *line, int history_control) { HIST_ENTRY *temp; int r; if (history_control == 0) return 1; /* ignorespace or ignoreboth */ if ((history_control & HC_IGNSPACE) && *line == ' ') return 0; /* ignoredups or ignoreboth */ if (history_control & HC_IGNDUPS) { using_history (); temp = previous_history (); r = (temp == 0 || strcmp (temp->line, line)); using_history (); if (r == 0) return r; } return 1; } /* Remove all entries matching LINE from the history list. Triggered when HISTCONTROL includes `erasedups'. */ static void hc_erasedups (const char *line) { HIST_ENTRY *temp; int r; using_history (); while ((temp = previous_history ())) { if (! strcmp (temp->line, line)) { r = where_history (); remove_history (r); } } using_history (); } /* Check LINE against HISTCONTROL and add it to the history if it's OK. Returns 1 if the line was saved in the history, 0 otherwise. */ int octave_add_history (const char *line, int history_control) { if (check_history_control (line, history_control)) { /* We're committed to saving the line. If the user has requested it, remove other matching lines from the history. */ if (history_control & HC_ERASEDUPS) hc_erasedups (line); add_history (line); return 1; } return 0; } int octave_where_history (void) { return where_history (); } int octave_history_length (void) { return history_length; } int octave_max_input_history (void) { return max_input_history; } int octave_history_base (void) { return history_base; } void octave_stifle_history (int n) { stifle_history (n); } int octave_unstifle_history (void) { return unstifle_history (); } int octave_history_is_stifled (void) { return history_is_stifled (); } int octave_history_set_pos (int n) { return history_set_pos (n); } int octave_read_history (const char *f) { return read_history (f); } void octave_using_history (void) { using_history (); } int octave_read_history_range (const char *f, int b, int e) { return read_history_range (f, b, e); } int octave_write_history (const char *f) { return write_history (f); } int octave_append_history (int n, const char *f) { return append_history (n, f); } int octave_history_truncate_file (const char *f, int n) { return history_truncate_file (f, n); } void octave_remove_history (int n) { HIST_ENTRY *discard = remove_history (n); if (discard) { if (discard->line) free (discard->line); free (discard); } } char * octave_history_goto_mark (int n) { HIST_ENTRY *h; char *retval = 0; if (history_set_pos (n)) { h = current_history (); if (h) retval = h->line; } return retval; } char * octave_history_get (int n) { char *retval = 0; HIST_ENTRY *h = history_get (n); if (h) retval = h->line; return retval; } char ** octave_history_list (int limit, int number_lines) { static char **retval = 0; HIST_ENTRY **hlist = 0; if (retval) { char **p = retval; while (*p) free (*p++); free (retval); retval = 0; } hlist = history_list (); if (hlist) { int i, k; int beg = 0; int end = 0; while (hlist[end]) end++; beg = (limit < 0 || end < limit) ? 0 : (end - limit); retval = malloc ((end - beg + 1) * sizeof (char **)); k = 0; for (i = beg; i < end; i++) { char *line = hlist[i]->line; int len = line ? strlen (line) : 0; char *tmp = malloc (len + 64); if (number_lines) sprintf (tmp, "%5d%c%s", i + history_base, hlist[i]->data ? '*' : ' ', line ? line : ""); else sprintf (tmp, "%c%s", hlist[i]->data ? '*' : ' ', line ? line : ""); retval[k++] = tmp; } retval[k] = 0; } return retval; } void octave_replace_history_entry (int which, const char *line) { HIST_ENTRY *discard = replace_history_entry (which, line, 0); if (discard) { if (discard->line) free (discard->line); free (discard); } } #endif