Ticket #4132: patchfile.patch

basic_regex_creator.hpp

@@ -769 +769 @@
       case syntax_element_assert_backref:
          {
             // just check that the index is valid:
-            int id = static_cast<const re_brace*>(state)->index;
-            if(id < 0)
+            int idx = static_cast<const re_brace*>(state)->index;
+            if(idx < 0)
             {
-               id = -id-1;
-               if(id >= 10000)
+               idx = -idx-1;
+               if(idx >= 10000)
                {
-                  id = m_pdata->get_id(id);
-                  if(id <= 0)
+                  idx = m_pdata->get_id(idx);
+                  if(idx <= 0)
                   {
                      // check of sub-expression that doesn't exist:
                      if(0 == this->m_pdata->m_status) // update the error code if not already set
@@ -804 +804 @@
          {
             bool ok = false;
             re_syntax_base* p = base;
-            std::ptrdiff_t id = static_cast<re_jump*>(state)->alt.i;
-            if(id > 10000)
-               id = m_pdata->get_id(id);
+            std::ptrdiff_t idx = static_cast<re_jump*>(state)->alt.i;
+            if(idx > 10000)
+               idx = m_pdata->get_id(idx);
             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 == idx))
                {
                   //
                   // We've found the target of the recursion, set the jump target:
@@ -833 +833 @@
                         next_rep_id = static_cast<re_repeat*>(p)->state_id;
                         break;
                      case syntax_element_endmark:
-                        if(static_cast<const re_brace*>(p)->index == id)
+                        if(static_cast<const re_brace*>(p)->index == idx)
                            next_rep_id = -1;
                         break;
                      default: 

perl_matcher_common.hpp

@@ -732 +732 @@
    {
       // Have we recursed into subexpression "index"?
       // If index == 0 then check for any recursion at all, otherwise for recursion to -index-1.
-      int id = -index-1;
-      if(id >= 10000)
-         id = re.get_data().get_id(id);
-      result = !recursion_stack.empty() && ((recursion_stack.back().id == id) || (index == 0));
+      int idx = -index-1;
+      if(idx >= 10000)
+         idx = re.get_data().get_id(idx);
+      result = !recursion_stack.empty() && ((recursion_stack.back().idx == idx) || (index == 0));
       pstate = pstate->next.p;
    }
    return result;