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

Subject: [Boost-commit] svn:boost r84052 - trunk/boost/regex/v4
From: john_at_[hidden]
Date: 2013-04-26 06:33:23

Author: johnmaddock
Date: 2013-04-26 06:33:22 EDT (Fri, 26 Apr 2013)
New Revision: 84052
URL: http://svn.boost.org/trac/boost/changeset/84052

Log:
Apply updated patches from #8476.
Fixes #8476.
Text files modified: 
   trunk/boost/regex/v4/basic_regex_creator.hpp |    11 +++--------                             
   trunk/boost/regex/v4/basic_regex_parser.hpp  |     8 +-------                                
   trunk/boost/regex/v4/regex_format.hpp        |     3 +--                                     
   3 files changed, 5 insertions(+), 17 deletions(-)

Modified: trunk/boost/regex/v4/basic_regex_creator.hpp
==============================================================================
--- trunk/boost/regex/v4/basic_regex_creator.hpp	(original)
+++ trunk/boost/regex/v4/basic_regex_creator.hpp	2013-04-26 06:33:22 EDT (Fri, 26 Apr 2013)
@@ -738,16 +738,13 @@
       case syntax_element_long_set_rep:
          // set the state_id of this repeat:
          static_cast<re_repeat*>(state)->state_id = m_repeater_id++;
-         // fall through:
          BOOST_FALLTHROUGH;
       case syntax_element_alt:
          std::memset(static_cast<re_alt*>(state)->_map, 0, sizeof(static_cast<re_alt*>(state)->_map));
          static_cast<re_alt*>(state)->can_be_null = 0;
-         // fall through:
          BOOST_FALLTHROUGH;
       case syntax_element_jump:
          static_cast<re_jump*>(state)->alt.p = getaddress(static_cast<re_jump*>(state)->alt.i, state);
-         // fall through again:
          BOOST_FALLTHROUGH;
       default:
          if(state->next.i)
@@ -880,6 +877,7 @@
                }
             }
          }
+         break;
       default:
          break;
       }
@@ -944,7 +942,6 @@
                e.raise();
             }
          }
-         // fall through:
          BOOST_FALLTHROUGH;
       default:
          state = state->next.p;
@@ -1157,14 +1154,13 @@
                break;
             }
             m_recursion_checks[recursion_sub] = true;
-            // fall through, can't handle nested recursion here...
+            // can't handle nested recursion here...
             BOOST_FALLTHROUGH;
          }
       case syntax_element_backref:
          // can be null, and any character can match:
          if(pnull)
             *pnull |= mask;
-         // fall through:
          BOOST_FALLTHROUGH;
       case syntax_element_wild:
       {
@@ -1365,7 +1361,6 @@
             state = state->next.p->next.p;
             break;
          }
-         // otherwise fall through:
          BOOST_FALLTHROUGH;
       default:
          state = state->next.p;
@@ -1463,6 +1458,7 @@
          if(state_id <= sizeof(m_bad_repeats) * CHAR_BIT)
             m_bad_repeats |= (one << state_id);
       }
+      break;
    default:
       break;
    }
@@ -1544,7 +1540,6 @@
       case syntax_element_long_set_rep:
          if(this->m_has_backrefs == 0)
             static_cast<re_repeat*>(state)->leading = true;
-         // fall through:
          BOOST_FALLTHROUGH;
       default:
          return;

Modified: trunk/boost/regex/v4/basic_regex_parser.hpp
==============================================================================
--- trunk/boost/regex/v4/basic_regex_parser.hpp	(original)
+++ trunk/boost/regex/v4/basic_regex_parser.hpp	2013-04-26 06:33:22 EDT (Fri, 26 Apr 2013)
@@ -369,7 +369,6 @@
          while((m_position != m_end) && !is_separator(*m_position++)){}
          return true;
       }
-      // Otherwise fall through:
       BOOST_FALLTHROUGH;
    default:
       result = parse_literal();
@@ -624,7 +623,6 @@
          {
          case 'w':
             negate = false;
-            // fall through:
             BOOST_FALLTHROUGH;
          case 'W':
             {
@@ -642,7 +640,6 @@
             }
          case 's':
             negate = false;
-            // fall through:
             BOOST_FALLTHROUGH;
          case 'S':
             return add_emacs_code(negate);
@@ -675,7 +672,6 @@
    {
    case regex_constants::escape_type_not_class:
       negate = true;
-      // fall through:
       BOOST_FALLTHROUGH;
    case regex_constants::escape_type_class:
       {
@@ -746,7 +742,6 @@
       break;
    case regex_constants::escape_type_not_property:
       negate = true;
-      // fall through:
       BOOST_FALLTHROUGH;
    case regex_constants::escape_type_property:
       {
@@ -906,7 +901,7 @@
    case regex_constants::escape_type_control_v:
       if(0 == (this->flags() & (regbase::main_option_type | regbase::no_perl_ex)))
          goto escape_type_class_jump;
-      // fallthrough:
+      BOOST_FALLTHROUGH;
    default:
       this->append_literal(unescape_character());
       break;
@@ -1964,7 +1959,6 @@
    {
    case regex_constants::syntax_or:
       m_mark_reset = m_mark_count;
-      // fall through:
       BOOST_FALLTHROUGH;
    case regex_constants::syntax_colon:
       //

Modified: trunk/boost/regex/v4/regex_format.hpp
==============================================================================
--- trunk/boost/regex/v4/regex_format.hpp	(original)
+++ trunk/boost/regex/v4/regex_format.hpp	2013-04-26 06:33:22 EDT (Fri, 26 Apr 2013)
@@ -283,7 +283,7 @@
             format_perl();
             break;
          }
-         // fall through, not a special character:
+         // not a special character:
          BOOST_FALLTHROUGH;
       default:
          put(*m_position);
@@ -355,7 +355,6 @@
    case '{':
       have_brace = true;
       ++m_position;
-      // fall through....
       BOOST_FALLTHROUGH;
    default:
       // see if we have a number: