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

Added support for (?(DEFINE) blocks and updated the docs accordingly.

Browse Source 
Added support for ICU libraries which may be named icui18n.lib on some Win32 platforms.

[SVN r55267]
This commit is contained in:
John Maddock
2009-07-29 17:11:56 +00:00
parent 78f1066b1f
commit 66b633b417
39 changed files with 496 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -762,29 +762,57 @@ void basic_regex_creator<charT, traits>::fixup_recursions(re_syntax_base* state)
{
switch(state->type)
{
case syntax_element_assert_backref:
{
// just check that the index is valid:
int id = static_cast<const re_brace*>(state)->index;
if(id < 0)
{
id = -id-1;
if(id >= 10000)
{
id = m_pdata->get_id(id);
if(id <= 0)
{
// check of sub-expression that doesn't exist:
if(0 == this->m_pdata->m_status) // update the error code if not already set
this->m_pdata->m_status = boost::regex_constants::error_bad_pattern;
//
// clear the expression, we should be empty:
//
this->m_pdata->m_expression = 0;
this->m_pdata->m_expression_len = 0;
//
// and throw if required:
//
if(0 == (this->flags() & regex_constants::no_except))
{
std::string message = this->m_pdata->m_ptraits->error_string(boost::regex_constants::error_bad_pattern);
boost::regex_error e(message, boost::regex_constants::error_bad_pattern, 0);
e.raise();
}
}
}
}
}
break;
case syntax_element_recurse:
{
bool ok = false;
re_syntax_base* p = base;
/*
if(static_cast<re_jump*>(state)->alt.i == 0)
int id = static_cast<re_jump*>(state)->alt.i;
if(id > 10000)
id = m_pdata->get_id(id);
while(p)
{
ok = true;
static_cast<re_jump*>(state)->alt.p = p;
}
else
{*/
while(p)
if((p->type == syntax_element_startmark) && (static_cast<re_brace*>(p)->index == id))
{
if((p->type == syntax_element_startmark) && (static_cast<re_brace*>(p)->index == static_cast<re_jump*>(state)->alt.i))
{
static_cast<re_jump*>(state)->alt.p = p;
ok = true;
break;
}
p = p->next.p;
static_cast<re_jump*>(state)->alt.p = p;
ok = true;
break;
}
//}
p = p->next.p;
}
if(!ok)
{
// recursion to sub-expression that doesn't exist: