feedc0de/boost_regex
1
0
Fork 0
forked from boostorg/regex
Code Pull Requests Activity

Apply updated patches from #8476.

Browse Source 
Fixes #8476.

[SVN r84052]
This commit is contained in:
John Maddock
2013-04-26 10:33:22 +00:00
parent eed2a486c4
commit 8a16bff57a
3 changed files with 5 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -738,16 +738,13 @@ void basic_regex_creator<charT, traits>::fixup_pointers(re_syntax_base* state)
case syntax_element_long_set_rep:
// set the state_id of this repeat:
static_cast<re_repeat*>(state)->state_id = m_repeater_id++;
// fall through:
BOOST_FALLTHROUGH;
case syntax_element_alt:
std::memset(static_cast<re_alt*>(state)->_map, 0, sizeof(static_cast<re_alt*>(state)->_map));
static_cast<re_alt*>(state)->can_be_null = 0;
// fall through:
BOOST_FALLTHROUGH;
case syntax_element_jump:
static_cast<re_jump*>(state)->alt.p = getaddress(static_cast<re_jump*>(state)->alt.i, state);
// fall through again:
BOOST_FALLTHROUGH;
default:
if(state->next.i)
@ -880,6 +877,7 @@ void basic_regex_creator<charT, traits>::fixup_recursions(re_syntax_base* state)
}
}
}
break;
default:
break;
}
@ -944,7 +942,6 @@ void basic_regex_creator<charT, traits>::create_startmaps(re_syntax_base* state)
e.raise();
}
}
// fall through:
BOOST_FALLTHROUGH;
default:
state = state->next.p;
@ -1157,14 +1154,13 @@ void basic_regex_creator<charT, traits>::create_startmap(re_syntax_base* state,
break;
}
m_recursion_checks[recursion_sub] = true;
// fall through, can't handle nested recursion here...
// can't handle nested recursion here...
BOOST_FALLTHROUGH;
}
case syntax_element_backref:
// can be null, and any character can match:
if(pnull)
*pnull |= mask;
// fall through:
BOOST_FALLTHROUGH;
case syntax_element_wild:
{
@ -1365,7 +1361,6 @@ void basic_regex_creator<charT, traits>::create_startmap(re_syntax_base* state,
state = state->next.p->next.p;
break;
}
// otherwise fall through:
BOOST_FALLTHROUGH;
default:
state = state->next.p;
@ -1463,6 +1458,7 @@ void basic_regex_creator<charT, traits>::set_bad_repeat(re_syntax_base* pt)
if(state_id <= sizeof(m_bad_repeats) * CHAR_BIT)
m_bad_repeats |= (one << state_id);
}
break;
default:
break;
}
@ -1544,7 +1540,6 @@ void basic_regex_creator<charT, traits>::probe_leading_repeat(re_syntax_base* st
case syntax_element_long_set_rep:
if(this->m_has_backrefs == 0)
static_cast<re_repeat*>(state)->leading = true;
// fall through:
BOOST_FALLTHROUGH;
default:
return;