Mercurial > hg > octave-nkf

annotate liboctave/caseless-str.h @ 13983:7dd7cccf0757

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 2c96207d0e06
children 72c96de7a403
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
11075
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
1 /*
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
2
11523
fd0a3ac60b0e update copyright notices
John W. Eaton <jwe@octave.org>
parents: 11075
diff changeset
3 Copyright (C) 2007-2011 Shai Ayal
11075
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
4
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
5 This file is part of Octave.
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
6
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
7 Octave is free software; you can redistribute it and/or modify it
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
8 under the terms of the GNU General Public License as published by the
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
9 Free Software Foundation; either version 3 of the License, or (at your
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
10 option) any later version.
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
11
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
12 Octave is distributed in the hope that it will be useful, but WITHOUT
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
15 for more details.
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
16
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
17 You should have received a copy of the GNU General Public License
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
18 along with Octave; see the file COPYING. If not, see
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
19 <http://www.gnu.org/licenses/>.
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
20
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
21 */
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
22
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
23 #if !defined (octave_caseless_str_h)
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
24 #define octave_caseless_str_h 1
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
25
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
26 #include <string>
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
27
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
28 class caseless_str : public std::string
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
29 {
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
30 public:
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
31
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
32 typedef std::string::iterator iterator;
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
33 typedef std::string::const_iterator const_iterator;
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
34
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
35 caseless_str (void) : std::string () { }
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
36 caseless_str (const std::string& s) : std::string (s) { }
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
37 caseless_str (const char *s) : std::string (s) { }
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
38
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
39 caseless_str (const caseless_str& name) : std::string (name) { }
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
40
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
41 caseless_str& operator = (const caseless_str& pname)
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
42 {
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
43 std::string::operator = (pname);
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
44 return *this;
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
45 }
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
46
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
47 operator std::string (void) const { return *this; }
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
48
12666
68a59630798d Fix case insenstive use of radio values in graphics objects (bug #33068)
David Bateman <dbateman@free.fr>
parents: 11523
diff changeset
49 bool operator < (const std::string& s) const
68a59630798d Fix case insenstive use of radio values in graphics objects (bug #33068)
David Bateman <dbateman@free.fr>
parents: 11523
diff changeset
50 {
68a59630798d Fix case insenstive use of radio values in graphics objects (bug #33068)
David Bateman <dbateman@free.fr>
parents: 11523
diff changeset
51 const_iterator p1 = begin ();
68a59630798d Fix case insenstive use of radio values in graphics objects (bug #33068)
David Bateman <dbateman@free.fr>
parents: 11523
diff changeset
52 const_iterator p2 = s.begin ();
68a59630798d Fix case insenstive use of radio values in graphics objects (bug #33068)
David Bateman <dbateman@free.fr>
parents: 11523
diff changeset
53
68a59630798d Fix case insenstive use of radio values in graphics objects (bug #33068)
David Bateman <dbateman@free.fr>
parents: 11523
diff changeset
54 while (p1 != end () && p2 != s.end ())
68a59630798d Fix case insenstive use of radio values in graphics objects (bug #33068)
David Bateman <dbateman@free.fr>
parents: 11523
diff changeset
55 {
12669
2c96207d0e06 caseless-str.h: Fix implementation of op<
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents: 12666
diff changeset
56 char lp1 = std::tolower (*p1), lp2 = std::tolower (*p2);
2c96207d0e06 caseless-str.h: Fix implementation of op<
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents: 12666
diff changeset
57
2c96207d0e06 caseless-str.h: Fix implementation of op<
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents: 12666
diff changeset
58 if ( lp1 > lp2 )
12666
68a59630798d Fix case insenstive use of radio values in graphics objects (bug #33068)
David Bateman <dbateman@free.fr>
parents: 11523
diff changeset
59 return false;
12669
2c96207d0e06 caseless-str.h: Fix implementation of op<
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents: 12666
diff changeset
60 if ( lp1 < lp2)
2c96207d0e06 caseless-str.h: Fix implementation of op<
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents: 12666
diff changeset
61 return true;
12666
68a59630798d Fix case insenstive use of radio values in graphics objects (bug #33068)
David Bateman <dbateman@free.fr>
parents: 11523
diff changeset
62
12669
2c96207d0e06 caseless-str.h: Fix implementation of op<
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents: 12666
diff changeset
63 p1++;
2c96207d0e06 caseless-str.h: Fix implementation of op<
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents: 12666
diff changeset
64 p2++;
12666
68a59630798d Fix case insenstive use of radio values in graphics objects (bug #33068)
David Bateman <dbateman@free.fr>
parents: 11523
diff changeset
65 }
68a59630798d Fix case insenstive use of radio values in graphics objects (bug #33068)
David Bateman <dbateman@free.fr>
parents: 11523
diff changeset
66
12669
2c96207d0e06 caseless-str.h: Fix implementation of op<
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents: 12666
diff changeset
67 if ( length () >= s.length ())
12666
68a59630798d Fix case insenstive use of radio values in graphics objects (bug #33068)
David Bateman <dbateman@free.fr>
parents: 11523
diff changeset
68 return false;
68a59630798d Fix case insenstive use of radio values in graphics objects (bug #33068)
David Bateman <dbateman@free.fr>
parents: 11523
diff changeset
69 else
68a59630798d Fix case insenstive use of radio values in graphics objects (bug #33068)
David Bateman <dbateman@free.fr>
parents: 11523
diff changeset
70 return true;
68a59630798d Fix case insenstive use of radio values in graphics objects (bug #33068)
David Bateman <dbateman@free.fr>
parents: 11523
diff changeset
71 }
68a59630798d Fix case insenstive use of radio values in graphics objects (bug #33068)
David Bateman <dbateman@free.fr>
parents: 11523
diff changeset
72
11075
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
73 // Case-insensitive comparison.
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
74 bool compare (const std::string& s, size_t limit = std::string::npos) const
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
75 {
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
76 const_iterator p1 = begin ();
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
77 const_iterator p2 = s.begin ();
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
78
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
79 size_t k = 0;
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
80
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
81 while (p1 != end () && p2 != s.end () && k++ < limit)
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
82 {
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
83 if (std::tolower (*p1) != std::tolower (*p2))
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
84 return false;
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
85
12669
2c96207d0e06 caseless-str.h: Fix implementation of op<
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents: 12666
diff changeset
86 p1++;
2c96207d0e06 caseless-str.h: Fix implementation of op<
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents: 12666
diff changeset
87 p2++;
11075
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
88 }
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
89
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
90 return (limit == std::string::npos) ? size () == s.size () : k == limit;
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
91 }
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
92 };
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
93
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
94 #endif