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

Added patches from 1.33 branch:

Browse Source 
Fix trailing - in ranges so that [a-b-] works.
Fix performance issue: don't call std::distance on bidirectional iterators.


[SVN r31533]
This commit is contained in:
John Maddock
2005-11-01 18:06:19 +00:00
parent 10a423db6e
commit 8a06157b46
2 changed files with 35 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/boost/regex/v4/basic_regex_parser.hpp
View File

@ -1220,6 +1220,17 @@ void basic_regex_parser<charT, traits>::parse_set_literal(basic_char_set<charT,
char_set.add_range(start_range, end_range); char_set.add_range(start_range, end_range);
if(this->m_traits.syntax_type(*m_position) == regex_constants::syntax_dash) if(this->m_traits.syntax_type(*m_position) == regex_constants::syntax_dash)
{ {
if(m_end == ++m_position)
{
fail(regex_constants::error_brack, m_position - m_base);
return;
}
if(this->m_traits.syntax_type(*m_position) == regex_constants::syntax_close_set)
{
// trailing - :
--m_position;
return;
}
fail(regex_constants::error_range, m_position - m_base); fail(regex_constants::error_range, m_position - m_base);
return; return;
} }

28
include/boost/regex/v4/perl_matcher_common.hpp
View File

@ -658,12 +658,32 @@ bool perl_matcher<BidiIterator, Allocator, traits>::match_restart_continue()
template <class BidiIterator, class Allocator, class traits> template <class BidiIterator, class Allocator, class traits>
bool perl_matcher<BidiIterator, Allocator, traits>::match_backstep() bool perl_matcher<BidiIterator, Allocator, traits>::match_backstep()
{ {
std::ptrdiff_t maxlen = ::boost::re_detail::distance(backstop, position); #ifdef BOOST_MSVC
if(maxlen < static_cast<const re_brace*>(pstate)->index) #pragma warning(push)
return false; #pragma warning(disable:4127)
std::advance(position, -static_cast<const re_brace*>(pstate)->index); #endif
if( ::boost::is_random_access_iterator<BidiIterator>::value)
{
std::ptrdiff_t maxlen = ::boost::re_detail::distance(backstop, position);
if(maxlen < static_cast<const re_brace*>(pstate)->index)
return false;
std::advance(position, -static_cast<const re_brace*>(pstate)->index);
}
else
{
int c = static_cast<const re_brace*>(pstate)->index;
while(c--)
{
if(position == backstop)
return false;
--position;
}
}
pstate = pstate->next.p; pstate = pstate->next.p;
return true; return true;
#ifdef BOOST_MSVC
#pragma warning(pop)
#endif
} }
template <class BidiIterator, class Allocator, class traits> template <class BidiIterator, class Allocator, class traits>