boostorg/regex
1
0
Fork 1
mirror of https://github.com/boostorg/regex.git synced 2025-07-18 23:02:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix for .{n,} failing in partial matches.

Browse Source 
Fix for [\x0-\xff] failing in wide character expressions.


[SVN r26566]
This commit is contained in:
John Maddock
2004-12-21 17:07:46 +00:00
parent ab6f20486b
commit de0ab9092a
5 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/Attic/history.html
View File

@ -24,6 +24,10 @@
</P> </P>
<HR> <HR>
<p></p> <p></p>
<P>Boost 1.32.1.</P>
<UL>
<LI>
Fixed bug in partial matches of bounded repeats of '.'.</LI></UL>
<P>Boost 1.31.0.</P> <P>Boost 1.31.0.</P>
<UL> <UL>
<LI> <LI>

4
doc/history.html
View File

@ -24,6 +24,10 @@
</P> </P>
<HR> <HR>
<p></p> <p></p>
<P>Boost 1.32.1.</P>
<UL>
<LI>
Fixed bug in partial matches of bounded repeats of '.'.</LI></UL>
<P>Boost 1.31.0.</P> <P>Boost 1.31.0.</P>
<UL> <UL>
<LI> <LI>

8
include/boost/regex/v4/perl_matcher.hpp
View File

@ -128,7 +128,7 @@ iterator BOOST_REGEX_CALL re_is_set_member(iterator next,
{ {
if(STR_COMP(s1, p) <= 0) if(STR_COMP(s1, p) <= 0)
{ {
while(*p)++p; do{ ++p; }while(*p);
++p; ++p;
if(STR_COMP(s1, p) >= 0) if(STR_COMP(s1, p) >= 0)
return set_->isnot ? next : ++next; return set_->isnot ? next : ++next;
@ -136,11 +136,11 @@ iterator BOOST_REGEX_CALL re_is_set_member(iterator next,
else else
{ {
// skip first string // skip first string
while(*p)++p; do{ ++p; }while(*p);
++p; ++p;
} }
// skip second string // skip second string
while(*p)++p; do{ ++p; }while(*p);
++p; ++p;
} }
} }
@ -154,7 +154,7 @@ iterator BOOST_REGEX_CALL re_is_set_member(iterator next,
if(STR_COMP(s1, p) == 0) if(STR_COMP(s1, p) == 0)
return set_->isnot ? next : ++next; return set_->isnot ? next : ++next;
// skip string // skip string
while(*p)++p; do{ ++p; }while(*p);
++p; ++p;
} }
} }

3
include/boost/regex/v4/perl_matcher_non_recursive.hpp
View File

@ -554,7 +554,10 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_dot_repeat
const re_repeat* rep = static_cast<const re_repeat*>(pstate); const re_repeat* rep = static_cast<const re_repeat*>(pstate);
unsigned count = (std::min)(static_cast<unsigned>(re_detail::distance(position, last)), static_cast<unsigned>(rep->greedy ? rep->max : rep->min)); unsigned count = (std::min)(static_cast<unsigned>(re_detail::distance(position, last)), static_cast<unsigned>(rep->greedy ? rep->max : rep->min));
if(rep->min > count) if(rep->min > count)
{
position = last;
return false; // not enough text left to match return false; // not enough text left to match
}
std::advance(position, count); std::advance(position, count);
if(rep->greedy) if(rep->greedy)

3
include/boost/regex/v4/perl_matcher_recursive.hpp
View File

@ -402,7 +402,10 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_dot_repeat
const re_repeat* rep = static_cast<const re_repeat*>(pstate); const re_repeat* rep = static_cast<const re_repeat*>(pstate);
unsigned count = (std::min)(static_cast<unsigned>(re_detail::distance(position, last)), (rep->greedy ? rep->max : rep->min)); unsigned count = (std::min)(static_cast<unsigned>(re_detail::distance(position, last)), (rep->greedy ? rep->max : rep->min));
if(rep->min > count) if(rep->min > count)
{
position = last;
return false; // not enough text left to match return false; // not enough text left to match
}
std::advance(position, count); std::advance(position, count);
if((rep->leading) && (count < rep->max) && (rep->greedy)) if((rep->leading) && (count < rep->max) && (rep->greedy))
restart = position; restart = position;