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

Fix up recursive implementation of ACCEPT and COMMIT.

Browse Source
This commit is contained in:
jzmaddock
2015-09-30 18:47:59 +01:00
parent b208ef4eed
commit 83140ddbed
6 changed files with 58 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -142,6 +142,8 @@ bool perl_matcher<BidiIterator, Allocator, traits>::match_startmark()
r = false;
else
r = true;
if(r && m_have_accept)
r = skip_until_paren(INT_MAX);
break;
}
case -3:
@ -183,6 +185,8 @@ bool perl_matcher<BidiIterator, Allocator, traits>::match_startmark()
}
}
#endif
if(r && m_have_accept)
r = skip_until_paren(INT_MAX);
break;
}
case -4:
@ -1003,11 +1007,45 @@ bool perl_matcher<BidiIterator, Allocator, traits>::match_commit()
}
template <class BidiIterator, class Allocator, class traits>
bool perl_matcher<BidiIterator, Allocator, traits>::match_accept()
bool perl_matcher<BidiIterator, Allocator, traits>::skip_until_paren(int index, bool match)
{
while(pstate)
{
if(pstate->type == syntax_element_endmark)
{
if(static_cast<const re_brace*>(pstate)->index == index)
{
if(match)
return this->match_endmark();
pstate = pstate->next.p;
return true;
}
else
{
// Unenclosed closing ), occurs when (*ACCEPT) is inside some other
// parenthesis which may or may not have other side effects associated with it.
bool r = match_endmark();
m_have_accept = true;
if(!pstate)
return r;
}
continue;
}
else if(pstate->type == syntax_element_match)
return true;
else if(pstate->type == syntax_element_startmark)
{
int idx = static_cast<const re_brace*>(pstate)->index;
pstate = pstate->next.p;
skip_until_paren(idx, false);
continue;
}
pstate = pstate->next.p;
}
return true;
}
} // namespace BOOST_REGEX_DETAIL_NS
} // namespace boost
#ifdef BOOST_MSVC