[Boost-commit] svn:boost r59415 - trunk/boost/regex/v4

Subject: [Boost-commit] svn:boost r59415 - trunk/boost/regex/v4
From: john_at_[hidden]
Date: 2010-02-01 08:12:51

Author: johnmaddock
Date: 2010-02-01 08:12:50 EST (Mon, 01 Feb 2010)
New Revision: 59415
URL: http://svn.boost.org/trac/boost/changeset/59415

Log:
Remove dead code.
Text files modified: 
   trunk/boost/regex/v4/perl_matcher.hpp               |     3 +--                                     
   trunk/boost/regex/v4/perl_matcher_non_recursive.hpp |     5 -----                                   
   trunk/boost/regex/v4/perl_matcher_recursive.hpp     |     6 ------                                  
   3 files changed, 1 insertions(+), 13 deletions(-)

Modified: trunk/boost/regex/v4/perl_matcher.hpp
==============================================================================
--- trunk/boost/regex/v4/perl_matcher.hpp	(original)
+++ trunk/boost/regex/v4/perl_matcher.hpp	2010-02-01 08:12:50 EST (Mon, 01 Feb 2010)
@@ -366,7 +366,7 @@
       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 @@
    unsigned char match_any_mask;
    // recursion information:
    std::vector<recursion_info<results_type> > recursion_stack;
-   //unsigned recursion_stack_position;
 
 #ifdef BOOST_REGEX_NON_RECURSIVE
    //

Modified: trunk/boost/regex/v4/perl_matcher_non_recursive.hpp
==============================================================================
--- trunk/boost/regex/v4/perl_matcher_non_recursive.hpp	(original)
+++ trunk/boost/regex/v4/perl_matcher_non_recursive.hpp	2010-02-01 08:12:50 EST (Mon, 01 Feb 2010)
@@ -911,8 +911,6 @@
    }
    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 @@
       {
          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 @@
    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 @@
       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;

Modified: trunk/boost/regex/v4/perl_matcher_recursive.hpp
==============================================================================
--- trunk/boost/regex/v4/perl_matcher_recursive.hpp	(original)
+++ trunk/boost/regex/v4/perl_matcher_recursive.hpp	2010-02-01 08:12:50 EST (Mon, 01 Feb 2010)
@@ -867,7 +867,6 @@
    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 @@
 
    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 @@
       {
          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 @@
             if(!match_all_states())
             {
                recursion_stack.push_back(saved);
-               //++recursion_stack_position;
                next_count = saved_count;
                return false;
             }
@@ -934,7 +930,6 @@
    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 @@
          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;