Merge branch 'develop' into git_issue_80

Fixed Conflicts:
	include/boost/regex/v4/basic_regex_creator.hpp
	include/boost/regex/v4/basic_regex_parser.hpp
This commit is contained in:
jzmaddock
2020-01-21 12:57:09 +00:00
9 changed files with 102 additions and 104 deletions

View File

@ -619,7 +619,7 @@ bool perl_matcher<BidiIterator, Allocator, traits>::match_backref()
// or PCRE.
//
int index = static_cast<const re_brace*>(pstate)->index;
if(index >= 10000)
if(index >= hash_value_mask)
{
named_subexpressions::range_type r = re.get_data().equal_range(index);
BOOST_ASSERT(r.first != r.second);
@ -768,7 +768,7 @@ inline bool perl_matcher<BidiIterator, Allocator, traits>::match_assert_backref(
{
// Have we matched subexpression "index"?
// Check if index is a hash value:
if(index >= 10000)
if(index >= hash_value_mask)
{
named_subexpressions::range_type r = re.get_data().equal_range(index);
while(r.first != r.second)
@ -792,7 +792,7 @@ inline bool perl_matcher<BidiIterator, Allocator, traits>::match_assert_backref(
// Have we recursed into subexpression "index"?
// If index == 0 then check for any recursion at all, otherwise for recursion to -index-1.
int idx = -(index+1);
if(idx >= 10000)
if(idx >= hash_value_mask)
{
named_subexpressions::range_type r = re.get_data().equal_range(idx);
int stack_index = recursion_stack.empty() ? -1 : recursion_stack.back().idx;