Mercurial > hg > octave-nkf
view liboctave/mk-ops.awk @ 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) 2003-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/>. BEGIN { declare_types = 0; generate_ops = 0; ntypes = 0; } { if (NR == 1 && make_inclusive_header) { print "// DO NOT EDIT -- generated by mk-ops"; tmp = make_inclusive_header; gsub (/[\.-]/, "_", tmp); printf ("#if !defined (octave_%s)\n", tmp); printf ("#define octave_%s 1\n", tmp); } } /^#/ { if ($2 == "types") declare_types = 1; else if ($2 == "ops") { generate_ops = 1; declare_types = 0; } next; } { if (declare_types) { ntypes++; if (NF == 6 || NF == 7) { if (NF == 7) core_type[ntypes] = $7; scalar_zero_val[ntypes] = $6; fwd_decl_ok[ntypes] = $5 == "YES"; header[ntypes] = $4 == "NONE" ? "" : $4; class[ntypes] = $3; type[ntypes] = $2; tag[ntypes] = $1; rev_tag[$1] = ntypes; } else printf ("skipping line %d: %s\n", NR, $0); } else if (generate_ops) { if (NF >= 4) { result_tag = $1; lhs_tag = $2; rhs_tag = $3; op_type = $4; bin_ops = index (op_type, "B") != 0; cmp_ops = index (op_type, "C") != 0; bool_ops = index (op_type, "L") != 0; n = 4; lhs_conv = cmp_ops ? $(++n) : ""; rhs_conv = cmp_ops ? $(++n) : ""; if (lhs_conv == "NONE") lhs_conv = ""; if (rhs_conv == "NONE") rhs_conv = ""; k = 0 while (NF > n) bool_headers[k++] = $(++n); cc_file = sprintf ("%s-%s-%s.cc", prefix, lhs_tag, rhs_tag); h_file = sprintf ("%s-%s-%s.h", prefix, lhs_tag, rhs_tag); if (list_cc_files) { print cc_file; next; } if (list_h_files) { print h_file; next; } if (make_inclusive_header) { printf ("#include \"%s\"\n", h_file); next; } h_guard = sprintf ("octave_%s_%s_%s_h", prefix, lhs_tag, rhs_tag); result_num = rev_tag[result_tag]; lhs_num = rev_tag[lhs_tag]; rhs_num = rev_tag[rhs_tag]; result_type = type[result_num]; lhs_type = type[lhs_num]; rhs_type = type[rhs_num]; lhs_core_type = core_type[lhs_num]; rhs_core_type = core_type[rhs_num]; result_scalar_zero_val = scalar_zero_val[result_num]; lhs_scalar_zero_val = scalar_zero_val[lhs_num]; rhs_scalar_zero_val = scalar_zero_val[rhs_num]; result_header = header[result_num]; lhs_header = header[lhs_num]; rhs_header = header[rhs_num]; lhs_class = class[lhs_num]; rhs_class = class[rhs_num]; print "// DO NOT EDIT -- generated by mk-ops" > h_file; printf ("#if !defined (%s)\n", h_guard) >> h_file; printf ("#define %s 1\n", h_guard) >> h_file; if (result_header) { if (result_fwd_decl_ok) printf ("class %s\n", result_type) >> h_file; else printf ("#include \"%s\"\n", result_header) >> h_file; } if (lhs_header && ! (lhs_header == result_header)) { if (result_fwd_decl_ok) printf ("class %s\n", lhs_type) >> h_file; else printf ("#include \"%s\"\n", lhs_header) >> h_file; } if (rhs_header && ! (rhs_header == lhs_header || rhs_header == result_header)) { if (result_fwd_decl_ok) printf ("class %s\n", rhs_type) >> h_file; else printf ("#include \"%s\"\n", rhs_header) >> h_file; } printf ("#include \"mx-op-decl.h\"\n") >> h_file; if (bin_ops) printf ("%s%s_BIN_OP_DECLS (%s, %s, %s, OCTAVE_API)\n", lhs_class, rhs_class, result_type, lhs_type, rhs_type) >> h_file if (cmp_ops) printf ("%s%s_CMP_OP_DECLS (%s, %s, OCTAVE_API)\n", lhs_class, rhs_class, lhs_type, rhs_type) >> h_file if (bool_ops) printf ("%s%s_BOOL_OP_DECLS (%s, %s, OCTAVE_API)\n", lhs_class, rhs_class, lhs_type, rhs_type) >> h_file print "#endif" >> h_file; close (h_file); print "// DO NOT EDIT -- generated by mk-ops" > cc_file; print "#ifdef HAVE_CONFIG_H" >> cc_file; print "#include <config.h>" >> cc_file; print "#endif" >> cc_file; print "#include \"Array-util.h\"" >> cc_file; printf ("#include \"%s\"\n", h_file) >> cc_file; printf ("#include \"mx-op-defs.h\"\n") >> cc_file; for (i in bool_headers) { printf ("#include \"%s\"\n", bool_headers[i]) >> cc_file; delete bool_headers[i]; } if (result_header) printf ("#include \"%s\"\n", result_header) >> cc_file; if (lhs_header && ! (lhs_header == result_header)) printf ("#include \"%s\"\n", lhs_header) >> cc_file; if (rhs_header && ! (rhs_header == lhs_header || rhs_header == result_header)) printf ("#include \"%s\"\n", rhs_header) >> cc_file; if (bin_ops) { if ((lhs_class == "DM" && rhs_class == "M") || (lhs_class == "M" && rhs_class == "DM")) printf ("%s%s_BIN_OPS (%s, %s, %s, %s)\n", lhs_class, rhs_class, result_type, lhs_type, rhs_type, result_scalar_zero_val) >> cc_file else printf ("%s%s_BIN_OPS (%s, %s, %s)\n", lhs_class, rhs_class, result_type, lhs_type, rhs_type) >> cc_file } if (cmp_ops) printf ("%s%s_CMP_OPS (%s, %s)\n", lhs_class, rhs_class, lhs_type, rhs_type) >> cc_file if (bool_ops) printf ("%s%s_BOOL_OPS (%s, %s)\n", lhs_class, rhs_class, lhs_type, rhs_type) >> cc_file close (cc_file); } else printf ("skipping line %d: %s\n", NR, $0); } } END { if (make_inclusive_header) print "#endif"; }