annotate liboctave/caseless-str.h @ 12666:68a59630798d stable

Fix case insenstive use of radio values in graphics objects (bug #33068) * caseless-str.h (bool operator < (const std::string& s) const)): New operator in the caseless_str class.
author David Bateman <dbateman@free.fr>
date Wed, 11 May 2011 22:02:32 +0200
parents fd0a3ac60b0e
children 2c96207d0e06
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 bool same = true;
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 p1 = begin ();
68a59630798d Fix case insenstive use of radio values in graphics objects (bug #33068)
David Bateman <dbateman@free.fr>
parents: 11523
diff changeset
53 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
54
68a59630798d Fix case insenstive use of radio values in graphics objects (bug #33068)
David Bateman <dbateman@free.fr>
parents: 11523
diff changeset
55 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
56 {
68a59630798d Fix case insenstive use of radio values in graphics objects (bug #33068)
David Bateman <dbateman@free.fr>
parents: 11523
diff changeset
57 if (std::tolower (*p2) < std::tolower (*p1))
68a59630798d Fix case insenstive use of radio values in graphics objects (bug #33068)
David Bateman <dbateman@free.fr>
parents: 11523
diff changeset
58 return false;
68a59630798d Fix case insenstive use of radio values in graphics objects (bug #33068)
David Bateman <dbateman@free.fr>
parents: 11523
diff changeset
59 if (same && (std::tolower (*p2) != std::tolower (*p1)))
68a59630798d Fix case insenstive use of radio values in graphics objects (bug #33068)
David Bateman <dbateman@free.fr>
parents: 11523
diff changeset
60 same = false;
68a59630798d Fix case insenstive use of radio values in graphics objects (bug #33068)
David Bateman <dbateman@free.fr>
parents: 11523
diff changeset
61
68a59630798d Fix case insenstive use of radio values in graphics objects (bug #33068)
David Bateman <dbateman@free.fr>
parents: 11523
diff changeset
62 *p1++;
68a59630798d Fix case insenstive use of radio values in graphics objects (bug #33068)
David Bateman <dbateman@free.fr>
parents: 11523
diff changeset
63 *p2++;
68a59630798d Fix case insenstive use of radio values in graphics objects (bug #33068)
David Bateman <dbateman@free.fr>
parents: 11523
diff changeset
64 }
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 if (same && (length() >= s.length ()))
68a59630798d Fix case insenstive use of radio values in graphics objects (bug #33068)
David Bateman <dbateman@free.fr>
parents: 11523
diff changeset
67 return false;
68a59630798d Fix case insenstive use of radio values in graphics objects (bug #33068)
David Bateman <dbateman@free.fr>
parents: 11523
diff changeset
68 else
68a59630798d Fix case insenstive use of radio values in graphics objects (bug #33068)
David Bateman <dbateman@free.fr>
parents: 11523
diff changeset
69 return true;
68a59630798d Fix case insenstive use of radio values in graphics objects (bug #33068)
David Bateman <dbateman@free.fr>
parents: 11523
diff changeset
70 }
68a59630798d Fix case insenstive use of radio values in graphics objects (bug #33068)
David Bateman <dbateman@free.fr>
parents: 11523
diff changeset
71
11075
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
72 // Case-insensitive comparison.
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
73 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
74 {
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
75 const_iterator p1 = begin ();
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
76 const_iterator p2 = s.begin ();
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
77
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
78 size_t k = 0;
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
79
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
80 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
81 {
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
82 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
83 return false;
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
84
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
85 *p1++;
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
86 *p2++;
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
87 }
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 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
90 }
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 #endif