Mercurial > hg > octave-nkf
view liboctave/lo-macros.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 | fd0a3ac60b0e |
children | 72c96de7a403 |
line wrap: on
line source
/* Copyright (C) 2010-2011 VZLU Prague 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_liboctave_macros_h) #define octave_liboctave_macros_h 1 // Core macros. Iteration is supported up to count 10. #define OCT_ITERATE_PARAM_MACRO0(MACRO, PARAM) #define OCT_ITERATE_PARAM_MACRO1(MACRO, PARAM) \ MACRO(0, PARAM) #define OCT_ITERATE_PARAM_MACRO2(MACRO, PARAM) \ MACRO(0, PARAM) MACRO(1, PARAM) #define OCT_ITERATE_PARAM_MACRO3(MACRO, PARAM) \ MACRO(0, PARAM) MACRO(1, PARAM) MACRO(2, PARAM) #define OCT_ITERATE_PARAM_MACRO4(MACRO, PARAM) \ MACRO(0, PARAM) MACRO(1, PARAM) MACRO(2, PARAM) MACRO(3, PARAM) #define OCT_ITERATE_PARAM_MACRO5(MACRO, PARAM) \ MACRO(0, PARAM) MACRO(1, PARAM) MACRO(2, PARAM) MACRO(3, PARAM) MACRO(4, PARAM) #define OCT_ITERATE_PARAM_MACRO6(MACRO, PARAM) \ OCT_ITERATE_PARAM_MACRO5(MACRO, PARAM) MACRO(5, PARAM) #define OCT_ITERATE_PARAM_MACRO7(MACRO, PARAM) \ OCT_ITERATE_PARAM_MACRO5(MACRO, PARAM) MACRO(5, PARAM) MACRO(6, PARAM) #define OCT_ITERATE_PARAM_MACRO8(MACRO, PARAM) \ OCT_ITERATE_PARAM_MACRO5(MACRO, PARAM) MACRO(5, PARAM) MACRO(6, PARAM) MACRO(7, PARAM) #define OCT_ITERATE_PARAM_MACRO9(MACRO, PARAM) \ OCT_ITERATE_PARAM_MACRO8(MACRO, PARAM) MACRO(8, PARAM) #define OCT_ITERATE_PARAM_MACRO10(MACRO, PARAM) \ OCT_ITERATE_PARAM_MACRO8(MACRO, PARAM) MACRO(8, PARAM) MACRO(9, PARAM) // expands to MACRO(0, PARAM) MACRO(1, PARAM) ... MACRO(NUM-1, PARAM) #define OCT_ITERATE_PARAM_MACRO(MACRO, PARAM, NUM) OCT_ITERATE_PARAM_MACRO##NUM(MACRO,PARAM) #define OCT_IF_PARAM0(MACRO, PARAM) #define OCT_IF_PARAM1(MACRO, PARAM) MACRO(PARAM) #define OCT_IF_PARAM2(MACRO, PARAM) MACRO(PARAM) #define OCT_IF_PARAM3(MACRO, PARAM) MACRO(PARAM) #define OCT_IF_PARAM4(MACRO, PARAM) MACRO(PARAM) #define OCT_IF_PARAM5(MACRO, PARAM) MACRO(PARAM) #define OCT_IF_PARAM6(MACRO, PARAM) MACRO(PARAM) #define OCT_IF_PARAM7(MACRO, PARAM) MACRO(PARAM) #define OCT_IF_PARAM8(MACRO, PARAM) MACRO(PARAM) #define OCT_IF_PARAM9(MACRO, PARAM) MACRO(PARAM) // expands to MACRO(PARAM) if NUM > 0 #define OCT_IF_PARAM(NUM, MACRO, PARAM) OCT_IF_PARAM##NUM(MACRO, PARAM) // concatenation and reverse concat #define OCT_CONCAT2(ARG1, ARG2) ARG1 ## ARG2 #define OCT_CONCAT2_REVERSE(ARG1, ARG2) ARG2 ## ARG1 #define OCT_IF_HELPER(X) X // expands to X if NUM > 0 #define OCT_IF(NUM, X) OCT_IF_PARAM(NUM, OCT_IF_HELPER, X) #define OCT_ITERATE_MACRO_HELPER(NUM, MACRO) MACRO(NUM) // expands to MACRO(0) ... MACRO(NUM-1) #define OCT_ITERATE_MACRO(MACRO, NUM) OCT_ITERATE_PARAM_MACRO(OCT_ITERATE_MACRO_HELPER, MACRO, NUM) #define OCT_MAKE_LIST_HELPER1(ARG) ARG, // expands to MACRO(0), MACRO(1), ..., MACRO(NUM-1) #define OCT_MAKE_LIST_HELPER(NUM, MACRO) OCT_IF_PARAM(NUM,OCT_MAKE_LIST_HELPER1,) MACRO(NUM) #define OCT_MAKE_LIST(MACRO, NUM) OCT_ITERATE_PARAM_MACRO(OCT_MAKE_LIST_HELPER, MACRO, NUM) #define OCT_MAKE_DECL_LIST_HELPER(NUM, PREFIX) \ OCT_IF_PARAM(NUM,OCT_MAKE_LIST_HELPER1,) OCT_CONCAT2(PREFIX, NUM) // expands to TYPE PREFIX0, TYPE PREFIX1, ..., TYPE PREFIX ## (NUM-1) #define OCT_MAKE_DECL_LIST(TYPE, PREFIX, NUM) \ OCT_ITERATE_PARAM_MACRO(OCT_MAKE_DECL_LIST_HELPER, TYPE PREFIX, NUM) #endif