Mercurial > hg > octave-nkf
view src/ov-typeinfo.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 | 57632dea2446 |
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_value_typeinfo_h) #define octave_value_typeinfo_h 1 #include <string> #include "Array.h" #include "ov.h" class string_vector; class OCTINTERP_API octave_value_typeinfo { public: typedef octave_value (*unary_class_op_fcn) (const octave_value&); typedef octave_value (*unary_op_fcn) (const octave_base_value&); typedef void (*non_const_unary_op_fcn) (octave_base_value&); typedef octave_value (*binary_class_op_fcn) (const octave_value&, const octave_value&); typedef octave_value (*binary_op_fcn) (const octave_base_value&, const octave_base_value&); typedef octave_value (*cat_op_fcn) (octave_base_value&, const octave_base_value&, const Array<octave_idx_type>& ra_idx); typedef octave_value (*assign_op_fcn) (octave_base_value&, const octave_value_list&, const octave_base_value&); typedef octave_value (*assignany_op_fcn) (octave_base_value&, const octave_value_list&, const octave_value&); static bool instance_ok (void); static int register_type (const std::string&, const std::string&, const octave_value&); static bool register_unary_class_op (octave_value::unary_op, unary_class_op_fcn); static bool register_unary_op (octave_value::unary_op, int, unary_op_fcn); static bool register_non_const_unary_op (octave_value::unary_op, int, non_const_unary_op_fcn); static bool register_binary_class_op (octave_value::binary_op, binary_class_op_fcn); static bool register_binary_op (octave_value::binary_op, int, int, binary_op_fcn); static bool register_binary_class_op (octave_value::compound_binary_op, binary_class_op_fcn); static bool register_binary_op (octave_value::compound_binary_op, int, int, binary_op_fcn); static bool register_cat_op (int, int, cat_op_fcn); static bool register_assign_op (octave_value::assign_op, int, int, assign_op_fcn); static bool register_assignany_op (octave_value::assign_op, int, assignany_op_fcn); static bool register_pref_assign_conv (int, int, int); static bool register_type_conv_op (int, int, octave_base_value::type_conv_fcn); static bool register_widening_op (int, int, octave_base_value::type_conv_fcn); static octave_value lookup_type (const std::string& nm) { return instance->do_lookup_type (nm); } static unary_class_op_fcn lookup_unary_class_op (octave_value::unary_op op) { return instance->do_lookup_unary_class_op (op); } static unary_op_fcn lookup_unary_op (octave_value::unary_op op, int t) { return instance->do_lookup_unary_op (op, t); } static non_const_unary_op_fcn lookup_non_const_unary_op (octave_value::unary_op op, int t) { return instance->do_lookup_non_const_unary_op (op, t); } static binary_class_op_fcn lookup_binary_class_op (octave_value::binary_op op) { return instance->do_lookup_binary_class_op (op); } static binary_op_fcn lookup_binary_op (octave_value::binary_op op, int t1, int t2) { return instance->do_lookup_binary_op (op, t1, t2); } static binary_class_op_fcn lookup_binary_class_op (octave_value::compound_binary_op op) { return instance->do_lookup_binary_class_op (op); } static binary_op_fcn lookup_binary_op (octave_value::compound_binary_op op, int t1, int t2) { return instance->do_lookup_binary_op (op, t1, t2); } static cat_op_fcn lookup_cat_op (int t1, int t2) { return instance->do_lookup_cat_op (t1, t2); } static assign_op_fcn lookup_assign_op (octave_value::assign_op op, int t_lhs, int t_rhs) { return instance->do_lookup_assign_op (op, t_lhs, t_rhs); } static assignany_op_fcn lookup_assignany_op (octave_value::assign_op op, int t_lhs) { return instance->do_lookup_assignany_op (op, t_lhs); } static int lookup_pref_assign_conv (int t_lhs, int t_rhs) { return instance->do_lookup_pref_assign_conv (t_lhs, t_rhs); } static octave_base_value::type_conv_fcn lookup_type_conv_op (int t, int t_result) { return instance->do_lookup_type_conv_op (t, t_result); } static octave_base_value::type_conv_fcn lookup_widening_op (int t, int t_result) { return instance->do_lookup_widening_op (t, t_result); } static string_vector installed_type_names (void) { return instance->do_installed_type_names (); } protected: octave_value_typeinfo (void) : num_types (0), types (dim_vector (init_tab_sz, 1), std::string ()), vals (dim_vector (init_tab_sz, 1)), unary_class_ops (dim_vector (octave_value::num_unary_ops, 1), 0), unary_ops (dim_vector (octave_value::num_unary_ops, init_tab_sz), 0), non_const_unary_ops (dim_vector (octave_value::num_unary_ops, init_tab_sz), 0), binary_class_ops (dim_vector (octave_value::num_binary_ops, 1), 0), binary_ops (dim_vector (octave_value::num_binary_ops, init_tab_sz, init_tab_sz), 0), compound_binary_class_ops (dim_vector (octave_value::num_compound_binary_ops, 1), 0), compound_binary_ops (dim_vector (octave_value::num_compound_binary_ops, init_tab_sz, init_tab_sz), 0), cat_ops (dim_vector (init_tab_sz, init_tab_sz), 0), assign_ops (dim_vector (octave_value::num_assign_ops, init_tab_sz, init_tab_sz), 0), assignany_ops (dim_vector (octave_value::num_assign_ops, init_tab_sz), 0), pref_assign_conv (dim_vector (init_tab_sz, init_tab_sz), -1), type_conv_ops (dim_vector (init_tab_sz, init_tab_sz), 0), widening_ops (dim_vector (init_tab_sz, init_tab_sz), 0) { } ~octave_value_typeinfo (void) { } private: static const int init_tab_sz; static octave_value_typeinfo *instance; static void cleanup_instance (void) { delete instance; instance = 0; } int num_types; Array<std::string> types; Array<octave_value> vals; Array<void *> unary_class_ops; Array<void *> unary_ops; Array<void *> non_const_unary_ops; Array<void *> binary_class_ops; Array<void *> binary_ops; Array<void *> compound_binary_class_ops; Array<void *> compound_binary_ops; Array<void *> cat_ops; Array<void *> assign_ops; Array<void *> assignany_ops; Array<int> pref_assign_conv; Array<void *> type_conv_ops; Array<void *> widening_ops; int do_register_type (const std::string&, const std::string&, const octave_value&); bool do_register_unary_class_op (octave_value::unary_op, unary_class_op_fcn); bool do_register_unary_op (octave_value::unary_op, int, unary_op_fcn); bool do_register_non_const_unary_op (octave_value::unary_op, int, non_const_unary_op_fcn); bool do_register_binary_class_op (octave_value::binary_op, binary_class_op_fcn); bool do_register_binary_op (octave_value::binary_op, int, int, binary_op_fcn); bool do_register_binary_class_op (octave_value::compound_binary_op, binary_class_op_fcn); bool do_register_binary_op (octave_value::compound_binary_op, int, int, binary_op_fcn); bool do_register_cat_op (int, int, cat_op_fcn); bool do_register_assign_op (octave_value::assign_op, int, int, assign_op_fcn); bool do_register_assignany_op (octave_value::assign_op, int, assignany_op_fcn); bool do_register_pref_assign_conv (int, int, int); bool do_register_type_conv_op (int, int, octave_base_value::type_conv_fcn); bool do_register_widening_op (int, int, octave_base_value::type_conv_fcn); octave_value do_lookup_type (const std::string& nm); unary_class_op_fcn do_lookup_unary_class_op (octave_value::unary_op); unary_op_fcn do_lookup_unary_op (octave_value::unary_op, int); non_const_unary_op_fcn do_lookup_non_const_unary_op (octave_value::unary_op, int); binary_class_op_fcn do_lookup_binary_class_op (octave_value::binary_op); binary_op_fcn do_lookup_binary_op (octave_value::binary_op, int, int); binary_class_op_fcn do_lookup_binary_class_op (octave_value::compound_binary_op); binary_op_fcn do_lookup_binary_op (octave_value::compound_binary_op, int, int); cat_op_fcn do_lookup_cat_op (int, int); assign_op_fcn do_lookup_assign_op (octave_value::assign_op, int, int); assignany_op_fcn do_lookup_assignany_op (octave_value::assign_op, int); int do_lookup_pref_assign_conv (int, int); octave_base_value::type_conv_fcn do_lookup_type_conv_op (int, int); octave_base_value::type_conv_fcn do_lookup_widening_op (int, int); string_vector do_installed_type_names (void); // No copying! octave_value_typeinfo (const octave_value_typeinfo&); octave_value_typeinfo& operator = (const octave_value_typeinfo&); }; #endif