Mercurial > hg > octave-lyh
view liboctave/util/caseless-str.h @ 15541:9db32cabeacf
Fix backslash handling in regexp pattern (Bug #37092)
* NEWS: Give an example of how escape sequence processing in single-quoted
regular expressions works.
* libinterp/corefcn/regexp.cc(do_regexp_string_escapes): Rename to
do_regexp_ptn_string_escapes. Only sequence to expand is '\b' for backspace.
Others are handled by PCRE.
* libinterp/corefcn/regexp.cc(do_regexp_rep_string_escapes): New function to
do escape sequence processing for the replacement string since the sequences
to expand differ from that of the regexp pattern.
* liboctave/util/regexp.cc(regexp::replace): Process backslashes in replacement
string so that '\$1' results in '$1' rather than replacement with first
capture buffer.
author | Rik <rik@octave.org> |
---|---|
date | Wed, 17 Oct 2012 20:13:19 -0700 |
parents | 648dabbb4c6b |
children |
line wrap: on
line source
/* Copyright (C) 2007-2012 Shai Ayal 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_caseless_str_h) #define octave_caseless_str_h 1 #include <cctype> #include <string> class caseless_str : public std::string { public: typedef std::string::iterator iterator; typedef std::string::const_iterator const_iterator; caseless_str (void) : std::string () { } caseless_str (const std::string& s) : std::string (s) { } caseless_str (const char *s) : std::string (s) { } caseless_str (const caseless_str& name) : std::string (name) { } caseless_str& operator = (const caseless_str& pname) { std::string::operator = (pname); return *this; } operator std::string (void) const { return *this; } bool operator < (const std::string& s) const { const_iterator p1 = begin (); const_iterator p2 = s.begin (); while (p1 != end () && p2 != s.end ()) { char lp1 = std::tolower (*p1), lp2 = std::tolower (*p2); if ( lp1 > lp2 ) return false; if ( lp1 < lp2) return true; p1++; p2++; } if ( length () >= s.length ()) return false; else return true; } // Case-insensitive comparison. bool compare (const std::string& s, size_t limit = std::string::npos) const { const_iterator p1 = begin (); const_iterator p2 = s.begin (); size_t k = 0; while (p1 != end () && p2 != s.end () && k++ < limit) { if (std::tolower (*p1) != std::tolower (*p2)) return false; p1++; p2++; } return (limit == std::string::npos) ? size () == s.size () : k == limit; } }; #endif