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

Change "id" to "idx" to be Objective C++ compatible.

Browse Source 
Fixes #2306.
Fixes #4132.
Fixes #4191.

[SVN r61789]
This commit is contained in:
John Maddock
2010-05-05 17:40:07 +00:00
parent 87d5fd1421
commit fa96f4edf1
9 changed files with 104 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -130,8 +130,8 @@ struct saved_single_repeat : public saved_state
template <class Results>
struct saved_recursion : public saved_state
{
saved_recursion(int id, const re_syntax_base* p, Results* pr)
: saved_state(14), recursion_id(id), preturn_address(p), results(*pr)
saved_recursion(int idx, const re_syntax_base* p, Results* pr)
: saved_state(14), recursion_id(idx), preturn_address(p), results(*pr)
{}
int recursion_id;
const re_syntax_base* preturn_address;
@ -329,7 +329,7 @@ inline void perl_matcher<BidiIterator, Allocator, traits>::push_single_repeat(st
}
template <class BidiIterator, class Allocator, class traits>
inline void perl_matcher<BidiIterator, Allocator, traits>::push_recursion(int id, const re_syntax_base* p, results_type* presults)
inline void perl_matcher<BidiIterator, Allocator, traits>::push_recursion(int idx, const re_syntax_base* p, results_type* presults)
{
saved_recursion<results_type>* pmp = static_cast<saved_recursion<results_type>*>(m_backup_state);
--pmp;
@ -339,7 +339,7 @@ inline void perl_matcher<BidiIterator, Allocator, traits>::push_recursion(int id
pmp = static_cast<saved_recursion<results_type>*>(m_backup_state);
--pmp;
}
(void) new (pmp)saved_recursion<results_type>(id, p, presults);
(void) new (pmp)saved_recursion<results_type>(idx, p, presults);
m_backup_state = pmp;
}
@ -910,7 +910,7 @@ bool perl_matcher<BidiIterator, Allocator, traits>::match_recursion()
push_repeater_count(static_cast<const re_recurse*>(pstate)->state_id, &next_count);
}
pstate = static_cast<const re_jump*>(pstate)->alt.p;
recursion_stack.back().id = static_cast<const re_brace*>(pstate)->index;
recursion_stack.back().idx = static_cast<const re_brace*>(pstate)->index;
return true;
}
@ -928,11 +928,11 @@ bool perl_matcher<BidiIterator, Allocator, traits>::match_endmark()
}
if(!recursion_stack.empty())
{
if(index == recursion_stack.back().id)
if(index == recursion_stack.back().idx)
{
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);
push_recursion(recursion_stack.back().idx, recursion_stack.back().preturn_address, &recursion_stack.back().results);
recursion_stack.pop_back();
}
}
@ -952,10 +952,10 @@ bool perl_matcher<BidiIterator, Allocator, traits>::match_match()
{
if(!recursion_stack.empty())
{
BOOST_ASSERT(0 == recursion_stack.back().id);
BOOST_ASSERT(0 == recursion_stack.back().idx);
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);
push_recursion(recursion_stack.back().idx, recursion_stack.back().preturn_address, &recursion_stack.back().results);
recursion_stack.pop_back();
return true;
}
@ -1523,7 +1523,7 @@ bool perl_matcher<BidiIterator, Allocator, traits>::unwind_recursion(bool r)
if(!r)
{
recursion_stack.push_back(recursion_info<results_type>());
recursion_stack.back().id = pmp->recursion_id;
recursion_stack.back().idx = pmp->recursion_id;
recursion_stack.back().preturn_address = pmp->preturn_address;
recursion_stack.back().results = pmp->results;
}