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

Remove dead code.

Browse Source 
[SVN r59415]
This commit is contained in:
John Maddock
2010-02-01 13:12:50 +00:00
parent d686c89333
commit 50892585d3
3 changed files with 1 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -366,7 +366,7 @@ public:
BidiIterator l_base)
: m_result(what), base(first), last(end),
position(first), backstop(l_base), re(e), traits_inst(e.get_traits()),
m_independent(false), next_count(&rep_obj), rep_obj(&next_count)/*, recursion_stack_position(0)*/
m_independent(false), next_count(&rep_obj), rep_obj(&next_count)
{
construct_init(e, f);
}
@ -489,7 +489,6 @@ private:
unsigned char match_any_mask;
// recursion information:
std::vector<recursion_info<results_type> > recursion_stack;
//unsigned recursion_stack_position;
#ifdef BOOST_REGEX_NON_RECURSIVE
//

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

@ -911,8 +911,6 @@ bool perl_matcher<BidiIterator, Allocator, traits>::match_recursion()
}
pstate = static_cast<const re_jump*>(pstate)->alt.p;
recursion_stack.back().id = static_cast<const re_brace*>(pstate)->index;
//++recursion_stack_position;
//BOOST_ASSERT(recursion_stack[recursion_stack_position-1].id);
return true;
}
@ -932,7 +930,6 @@ bool perl_matcher<BidiIterator, Allocator, traits>::match_endmark()
{
if(index == recursion_stack.back().id)
{
//--recursion_stack_position;
pstate = recursion_stack.back().preturn_address;
*m_presult = recursion_stack.back().results;
push_recursion(recursion_stack.back().id, recursion_stack.back().preturn_address, &recursion_stack.back().results);
@ -956,7 +953,6 @@ bool perl_matcher<BidiIterator, Allocator, traits>::match_match()
if(!recursion_stack.empty())
{
BOOST_ASSERT(0 == recursion_stack.back().id);
//--recursion_stack_position;
pstate = recursion_stack.back().preturn_address;
*m_presult = recursion_stack.back().results;
push_recursion(recursion_stack.back().id, recursion_stack.back().preturn_address, &recursion_stack.back().results);
@ -1530,7 +1526,6 @@ bool perl_matcher<BidiIterator, Allocator, traits>::unwind_recursion(bool r)
recursion_stack.back().id = pmp->recursion_id;
recursion_stack.back().preturn_address = pmp->preturn_address;
recursion_stack.back().results = pmp->results;
//++recursion_stack_position;
}
boost::re_detail::inplace_destroy(pmp++);
m_backup_state = pmp;

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

@ -867,7 +867,6 @@ bool perl_matcher<BidiIterator, Allocator, traits>::match_recursion()
recursion_stack.back().repeater_stack = next_count;
pstate = static_cast<const re_jump*>(pstate)->alt.p;
recursion_stack.back().id = static_cast<const re_brace*>(pstate)->index;
//++recursion_stack_position;
repeater_count<BidiIterator>* saved = next_count;
repeater_count<BidiIterator> r(&next_count); // resets all repeat counts since we're recursing and starting fresh on those
@ -877,7 +876,6 @@ bool perl_matcher<BidiIterator, Allocator, traits>::match_recursion()
if(!result)
{
//--recursion_stack_position;
next_count = recursion_stack.back().repeater_stack;
*m_presult = recursion_stack.back().results;
recursion_stack.pop_back();
@ -901,7 +899,6 @@ bool perl_matcher<BidiIterator, Allocator, traits>::match_endmark()
{
if(index == recursion_stack.back().id)
{
//--recursion_stack_position;
recursion_info<results_type> saved = recursion_stack.back();
recursion_stack.pop_back();
const re_syntax_base* saved_state = pstate = saved.preturn_address;
@ -911,7 +908,6 @@ bool perl_matcher<BidiIterator, Allocator, traits>::match_endmark()
if(!match_all_states())
{
recursion_stack.push_back(saved);
//++recursion_stack_position;
next_count = saved_count;
return false;
}
@ -934,7 +930,6 @@ bool perl_matcher<BidiIterator, Allocator, traits>::match_match()
if(!recursion_stack.empty())
{
BOOST_ASSERT(0 == recursion_stack.back().id);
//--recursion_stack_position;
const re_syntax_base* saved_state = pstate = recursion_stack.back().preturn_address;
*m_presult = recursion_stack.back().results;
recursion_stack.pop_back();
@ -943,7 +938,6 @@ bool perl_matcher<BidiIterator, Allocator, traits>::match_match()
recursion_stack.push_back(recursion_info<results_type>());
recursion_stack.back().preturn_address = saved_state;
recursion_stack.back().results = *m_presult;
//++recursion_stack_position;
return false;
}
return true;