Restrict fix to where we really need it.

.github/workflows/ci.yml

@@ -9,7 +9,6 @@ on:
     branches:
       - master
       - develop
-      - feature/**
   pull_request:
   release:
     types: [published, created, edited]

include/boost/regex/v5/basic_regex.hpp

@@ -19,15 +19,6 @@
 #ifndef BOOST_REGEX_V5_BASIC_REGEX_HPP
 #define BOOST_REGEX_V5_BASIC_REGEX_HPP
 
-#include <boost/regex/v5/regbase.hpp>
-#include <boost/regex/v5/syntax_type.hpp>
-#include <boost/regex/v5/regex_traits.hpp>
-#include <boost/regex/v5/states.hpp>
-#include <boost/regex/v5/regex_raw_buffer.hpp>
-
-#include <algorithm>
-#include <limits>
-#include <memory>
 #include <vector>
 
 namespace boost{

include/boost/regex/v5/basic_regex_creator.hpp

@@ -28,9 +28,6 @@
 #endif
 #endif
 
-#include <boost/regex/v5/basic_regex.hpp>
-
-#include <vector>
 #include <set>
 
 namespace boost{
@@ -974,12 +971,7 @@ template <class charT, class traits>
 int basic_regex_creator<charT, traits>::calculate_backstep(re_syntax_base* state)
 {
    typedef typename traits::char_class_type m_type;
-
    int result = 0;
-   int last_alternative_result = -1;
-
-   std::vector<std::tuple<int, re_syntax_base*>> stack;
-
    while(state)
    {
       switch(state->type)
@@ -998,28 +990,9 @@ int basic_regex_creator<charT, traits>::calculate_backstep(re_syntax_base* state
          }
          break;
       case syntax_element_endmark:
-         if ((static_cast<re_brace*>(state)->index == -1)
+         if((static_cast<re_brace*>(state)->index == -1)
             || (static_cast<re_brace*>(state)->index == -2))
-         {
-            // We've finished the calculation, check against any previous alternatives:
-            if (last_alternative_result >= 0)
-            {
-               if (last_alternative_result != result)
-                  return -1;
-            }
-            else
-               last_alternative_result = result;
-
-            if (stack.size())
-            {
-               // Skip to next alternative and calculate that as well:
-               std::tie(result, state) = stack.back();
-               stack.pop_back();
-               continue;
-            }
-            else
-               return result;
-         }
+            return result;
          break;
       case syntax_element_literal:
          result += static_cast<re_literal*>(state)->length;
@@ -1075,13 +1048,11 @@ int basic_regex_creator<charT, traits>::calculate_backstep(re_syntax_base* state
          continue;
       case syntax_element_alt:
          {
-            // Push the alternative if we haven't pushed too many already:
-            if(stack.size() > BOOST_REGEX_MAX_BLOCKS)
+            int r1 = calculate_backstep(state->next.p);
+            int r2 = calculate_backstep(static_cast<re_alt*>(state)->alt.p);
+            if((r1 < 0) || (r1 != r2))
                return -1;
-            stack.push_back(std::make_tuple(result, static_cast<re_alt*>(state)->alt.p));
-            // and take the first one:
-            state = state->next.p;
-            continue;
+            return result + r1;
          }
       default:
          break;

include/boost/regex/v5/basic_regex_parser.hpp

@@ -19,13 +19,6 @@
 #ifndef BOOST_REGEX_V5_BASIC_REGEX_PARSER_HPP
 #define BOOST_REGEX_V5_BASIC_REGEX_PARSER_HPP
 
-#include <boost/regex/v5/basic_regex_creator.hpp>
-
-#include <climits>
-#include <cstdint>
-#include <limits>
-#include <type_traits>
-
 namespace boost{
 namespace BOOST_REGEX_DETAIL_NS{
 

include/boost/regex/v5/c_regex_traits.hpp

@@ -21,12 +21,7 @@
 
 #include <boost/regex/config.hpp>
 #include <boost/regex/v5/regex_workaround.hpp>
-#include <boost/regex/v5/primary_transform.hpp>
-#include <boost/regex/v5/regex_traits_defaults.hpp>
-
 #include <cctype>
-#include <cstdint>
-#include <cwctype>
 
 namespace boost{
 

include/boost/regex/v5/char_regex_traits.hpp

@@ -20,8 +20,6 @@
 #ifndef BOOST_REGEX_V5_CHAR_REGEX_TRAITS_HPP
 #define BOOST_REGEX_V5_CHAR_REGEX_TRAITS_HPP
 
-#include <boost/regex/v5/regex_traits.hpp>
-
 namespace boost{
 
 namespace deprecated{

include/boost/regex/v5/iterator_traits.hpp

@@ -19,8 +19,6 @@
 #ifndef BOOST_REGEX_V5_ITERATOR_TRAITS_HPP
 #define BOOST_REGEX_V5_ITERATOR_TRAITS_HPP
 
-#include <iterator>
-
 namespace boost{
 namespace BOOST_REGEX_DETAIL_NS{
 

include/boost/regex/v5/match_results.hpp

@@ -19,14 +19,6 @@
 #ifndef BOOST_REGEX_V5_MATCH_RESULTS_HPP
 #define BOOST_REGEX_V5_MATCH_RESULTS_HPP
 
-#include <boost/regex/v5/match_flags.hpp>
-#include <boost/regex/v5/sub_match.hpp>
-#include <boost/regex/v5/basic_regex.hpp>
-#include <boost/regex/v5/regex_format.hpp>
-
-#include <string>
-#include <vector>
-
 namespace boost{
 #ifdef BOOST_REGEX_MSVC
 #pragma warning(push)

include/boost/regex/v5/mem_block_cache.hpp

@@ -18,8 +18,6 @@
 #ifndef BOOST_REGEX_V5_MEM_BLOCK_CACHE_HPP
 #define BOOST_REGEX_V5_MEM_BLOCK_CACHE_HPP
 
-#include <boost/regex/config.hpp>
-
 #include <new>
 #ifdef BOOST_HAS_THREADS
 #include <mutex>
@@ -33,7 +31,6 @@
   #endif
 #endif
 
-
 namespace boost{
 namespace BOOST_REGEX_DETAIL_NS{
 

include/boost/regex/v5/perl_matcher.hpp

@@ -12,18 +12,7 @@
 #ifndef BOOST_REGEX_MATCHER_HPP
 #define BOOST_REGEX_MATCHER_HPP
 
-#include <boost/regex/v5/match_flags.hpp>
-#include <boost/regex/v5/match_results.hpp>
-#include <boost/regex/v5/regbase.hpp>
 #include <boost/regex/v5/iterator_category.hpp>
-#include <boost/regex/v5/states.hpp>
-#include <boost/regex/v5/regex_traits.hpp>
-
-#ifndef BOOST_REGEX_STANDALONE
-#include <boost/throw_exception.hpp>
-#endif
-
-#include <climits>
 
 #ifdef BOOST_REGEX_MSVC
 #  pragma warning(push)
@@ -39,34 +28,25 @@
 #endif
 #endif
 
-#ifndef BOOST_REGEX_STANDALONE
-#  define BOOST_REGEX_DETAIL_THROW(ex) boost::throw_exception(ex)
-#else
-#  define BOOST_REGEX_DETAIL_THROW(ex) throw ex
-#endif
-
 namespace boost{
 namespace BOOST_REGEX_DETAIL_NS{
 
 //
 // error checking API:
 //
-inline void verify_options(boost::regex_constants::syntax_option_type, match_flag_type mf)
+inline void  verify_options(boost::regex_constants::syntax_option_type, match_flag_type mf)
 {
-   auto is_perl = (mf & match_perl);
-   auto is_posix = (mf & match_posix);
-
-   if (is_perl && is_posix)
-   {
-      BOOST_REGEX_DETAIL_THROW(std::logic_error("Usage Error: Can't mix Perl and POSIX matching rules"));
-   }
-
    //
    // can't mix match_extra with POSIX matching rules:
    //
-   if ((mf & match_extra) && is_posix)
+   if ((mf & match_extra) && (mf & match_posix))
    {
-      BOOST_REGEX_DETAIL_THROW(std::logic_error("Usage Error: Can't mix regular expression captures with POSIX matching rules"));
+      std::logic_error msg("Usage Error: Can't mix regular expression captures with POSIX matching rules");
+#ifndef BOOST_REGEX_STANDALONE
+      throw_exception(msg);
+#else
+      throw msg;
+#endif
    }
 }
 //

include/boost/regex/v5/perl_matcher_common.hpp

@@ -20,22 +20,6 @@
 #ifndef BOOST_REGEX_V5_PERL_MATCHER_COMMON_HPP
 #define BOOST_REGEX_V5_PERL_MATCHER_COMMON_HPP
 
-#include <boost/regex/config.hpp>
-
-#ifndef BOOST_REGEX_STANDALONE
-
-#include <boost/config.hpp>
-#if defined(BOOST_HAS_PRAGMA_ONCE)
-#pragma once
-#include <boost/regex/v5/perl_matcher.hpp>
-#endif
-
-#endif
-
-#include <boost/regex/v5/basic_regex.hpp>
-#include <boost/regex/v5/match_flags.hpp>
-#include <boost/regex/v5/match_results.hpp>
-
 #ifdef BOOST_REGEX_MSVC
 #  pragma warning(push)
 #pragma warning(disable:4459)
@@ -60,7 +44,12 @@ void perl_matcher<BidiIterator, Allocator, traits>::construct_init(const basic_r
    if(e.empty())
    {
       // precondition failure: e is not a valid regex.
-      BOOST_REGEX_DETAIL_THROW(std::invalid_argument("Invalid regular expression object"));
+      std::invalid_argument ex("Invalid regular expression object");
+#ifndef BOOST_REGEX_STANDALONE
+      boost::throw_exception(ex);
+#else
+      throw e;
+#endif
    }
    pstate = 0;
    m_match_flags = f;
@@ -93,11 +82,7 @@ void perl_matcher<BidiIterator, Allocator, traits>::construct_init(const basic_r
    match_any_mask = static_cast<unsigned char>((f & match_not_dot_newline) ? BOOST_REGEX_DETAIL_NS::test_not_newline : BOOST_REGEX_DETAIL_NS::test_newline);
    // Disable match_any if requested in the state machine:
    if(e.get_data().m_disable_match_any)
-   {
-      if (m_match_flags & match_posix)
-         BOOST_REGEX_DETAIL_THROW(std::logic_error("Invalid regex for POSIX-style matching"));
       m_match_flags &= regex_constants::match_not_any;
-   }
 }
 #ifdef BOOST_REGEX_MSVC
 #  pragma warning(pop)

include/boost/regex/v5/perl_matcher_non_recursive.hpp

@@ -20,18 +20,6 @@
 #ifndef BOOST_REGEX_V5_PERL_MATCHER_NON_RECURSIVE_HPP
 #define BOOST_REGEX_V5_PERL_MATCHER_NON_RECURSIVE_HPP
 
-#include <boost/regex/config.hpp>
-
-#ifndef BOOST_REGEX_STANDALONE
-
-#include <boost/config.hpp>
-#if defined(BOOST_HAS_PRAGMA_ONCE)
-#pragma once
-#include <boost/regex/v5/perl_matcher.hpp>
-#endif
-
-#endif
-
 #include <boost/regex/v5/mem_block_cache.hpp>
 
 #ifdef BOOST_REGEX_MSVC

include/boost/regex/v5/regex_format.hpp

@@ -21,10 +21,6 @@
 #ifndef BOOST_REGEX_FORMAT_HPP
 #define BOOST_REGEX_FORMAT_HPP
 
-#include <boost/regex/v5/match_flags.hpp>
-#include <boost/regex/v5/sub_match.hpp>
-#include <boost/regex/v5/regex_traits_defaults.hpp>
-
 #include <type_traits>
 #include <functional>
 

include/boost/regex/v5/regex_grep.hpp

@@ -19,10 +19,6 @@
 #ifndef BOOST_REGEX_V5_REGEX_GREP_HPP
 #define BOOST_REGEX_V5_REGEX_GREP_HPP
 
-#include <boost/regex/v5/basic_regex.hpp>
-#include <boost/regex/v5/match_flags.hpp>
-#include <boost/regex/v5/match_results.hpp>
-#include <boost/regex/v5/perl_matcher.hpp>
 
 namespace boost{
 

include/boost/regex/v5/regex_iterator.hpp

@@ -19,9 +19,6 @@
 #ifndef BOOST_REGEX_V5_REGEX_ITERATOR_HPP
 #define BOOST_REGEX_V5_REGEX_ITERATOR_HPP
 
-#include <boost/regex/v5/basic_regex.hpp>
-#include <boost/regex/v5/match_results.hpp>
-
 #include <memory>
 
 namespace boost{

include/boost/regex/v5/regex_match.hpp

@@ -22,9 +22,6 @@
 #ifndef BOOST_REGEX_MATCH_HPP
 #define BOOST_REGEX_MATCH_HPP
 
-#include <boost/regex/v5/match_results.hpp>
-#include <boost/regex/v5/perl_matcher.hpp>
-
 namespace boost{
 
 //

include/boost/regex/v5/regex_raw_buffer.hpp

@@ -27,7 +27,6 @@
 
 #include <algorithm>
 #include <cstddef>
-#include <cstring>
 
 namespace boost{
    namespace BOOST_REGEX_DETAIL_NS{

include/boost/regex/v5/regex_replace.hpp

@@ -22,10 +22,6 @@
 #define BOOST_REGEX_V5_REGEX_REPLACE_HPP
 
 
-#include <boost/regex/v5/basic_regex.hpp>
-#include <boost/regex/v5/match_flags.hpp>
-#include <boost/regex/v5/regex_iterator.hpp>
-
 namespace boost{
 
 template <class OutputIterator, class BidirectionalIterator, class traits, class charT, class Formatter>

include/boost/regex/v5/regex_search.hpp

@@ -20,9 +20,6 @@
 #define BOOST_REGEX_V5_REGEX_SEARCH_HPP
 
 
-#include <boost/regex/v5/match_results.hpp>
-#include <boost/regex/v5/perl_matcher.hpp>
-
 namespace boost{
 
 template <class BidiIterator, class Allocator, class charT, class traits>

include/boost/regex/v5/regex_split.hpp

@@ -21,9 +21,6 @@
 #ifndef BOOST_REGEX_SPLIT_HPP
 #define BOOST_REGEX_SPLIT_HPP
 
-#include <boost/regex/v5/basic_regex.hpp>
-#include <boost/regex/v5/match_results.hpp>
-
 namespace boost{
 
 #ifdef BOOST_REGEX_MSVC

include/boost/regex/v5/regex_token_iterator.hpp

@@ -19,10 +19,6 @@
 #ifndef BOOST_REGEX_V5_REGEX_TOKEN_ITERATOR_HPP
 #define BOOST_REGEX_V5_REGEX_TOKEN_ITERATOR_HPP
 
-#include <boost/regex/v5/basic_regex.hpp>
-#include <boost/regex/v5/match_results.hpp>
-#include <boost/regex/v5/sub_match.hpp>
-
 #include <memory>
 
 namespace boost{

include/boost/regex/v5/states.hpp

@@ -19,11 +19,6 @@
 #ifndef BOOST_REGEX_V5_STATES_HPP
 #define BOOST_REGEX_V5_STATES_HPP
 
-#include <boost/regex/v5/regex_raw_buffer.hpp>
-
-#include <climits>
-#include <cstddef>
-
 namespace boost{
 namespace BOOST_REGEX_DETAIL_NS{
 

include/boost/regex/v5/sub_match.hpp

@@ -19,9 +19,6 @@
 #ifndef BOOST_REGEX_V5_SUB_MATCH_HPP
 #define BOOST_REGEX_V5_SUB_MATCH_HPP
 
-#include <iterator>
-#include <utility>
-
 namespace boost{
 
 template <class BidiIterator>

include/boost/regex/v5/u32regex_iterator.hpp

@@ -19,21 +19,6 @@
 #ifndef BOOST_REGEX_V5_U32REGEX_ITERATOR_HPP
 #define BOOST_REGEX_V5_U32REGEX_ITERATOR_HPP
 
-#include <boost/regex/config.hpp>
-
-#ifndef BOOST_REGEX_STANDALONE
-
-#include <boost/config.hpp>
-#if defined(BOOST_HAS_PRAGMA_ONCE)
-#pragma once
-#include <boost/regex/v5/icu.hpp>
-#endif
-
-#endif
-
-#include <boost/regex/v5/match_flags.hpp>
-#include <boost/regex/v5/match_results.hpp>
-
 namespace boost{
 
 template <class BidirectionalIterator>

include/boost/regex/v5/u32regex_token_iterator.hpp

@@ -19,18 +19,6 @@
 #ifndef BOOST_REGEX_V5_U32REGEX_TOKEN_ITERATOR_HPP
 #define BOOST_REGEX_V5_U32REGEX_TOKEN_ITERATOR_HPP
 
-#include <boost/regex/config.hpp>
-
-#ifndef BOOST_REGEX_STANDALONE
-
-#include <boost/config.hpp>
-#if defined(BOOST_HAS_PRAGMA_ONCE)
-#pragma once
-#include <boost/regex/v5/icu.hpp>
-#endif
-
-#endif
-
 namespace boost{
 
 #ifdef BOOST_REGEX_MSVC

test/Jamfile.v2

@@ -136,6 +136,3 @@ compile test_windows_defs_4.cpp ;
 
 run issue153.cpp : : : "<toolset>msvc:<linkflags>-STACK:2097152" ;
 run issue227.cpp ;
-run issue232.cpp ;
-run lookbehind_recursion_stress_test.cpp ;
-

test/issue232.cpp

@@ -1,71 +0,0 @@
-#include <boost/core/lightweight_test.hpp>
-
-#include <boost/regex.hpp>
-#include <cstddef>
-#include <vector>
-
-template<std::size_t N0, std::size_t N = N0 - 1>
-void tester( char const (&str)[ N0 ] )
-{
-   std::vector<char> s(N, '\0');
-   std::memcpy(s.data(), str, N);
-   boost::regex rx(s.begin(), s.end());
-
-   std::vector<std::string> wheres;
-   wheres.push_back(std::string(15, 'H'));
-   wheres.push_back("");
-   wheres.push_back("                         ");
-
-   // Perl-style matching
-   for (auto const& where : wheres) {
-      boost::match_results<std::string::const_iterator> what;
-      bool match = boost::regex_match(where, what, rx, boost::match_default | boost::match_partial | boost::match_any | boost::match_perl);
-      (void) match;
-   }
-
-   // POSIX-style matching
-   for (auto const& where : wheres) {
-      try {
-         boost::match_results<std::string::const_iterator> what;
-         bool match = boost::regex_match(where, what, rx, boost::match_default | boost::match_partial | boost::match_any | boost::match_posix);
-         (void) match;
-      } catch(...) {}
-   }
-
-}
-
-int main()
-{
-   // test strings derived from fuzzing
-   // we keep a simple human-readable version
-   char const str1[] = "(Y(*COMMIT)|\\K\\D|.)+";
-   char const str2[] = "(Y(*COMMIT){||\\K\\D|||||||||\\K|||ss|||||.|\232*(?(50)\027\0204657|H)\020}\031\000.* 6.'?-i)+[L??.\000\000\000\004\000\000\000\000?..<[\000\024R]*+";
-   char const str3[] = "(Y(*COMMIT)\xFF\x80|\\L\\K||||||||||.|||||\x84|||||\x00\x00\x10||||||.*  .'?-i)[L??...-i)[L??...[\x00\x14R]*+";
-   char const str4[] = "(Y(*COMMIT)\x96||.*  .*  .\\K|||\x9F||||\x9C|.|||||\x84\x99|||\x01\x00\x00\x00|||'?-i#PL\x00\x01.\x86??OMMIT)?...[\x00\x14R]*+";
-
-   tester(str1);
-   tester(str2);
-   tester(str3);
-   tester(str4);
-
-   // prove that we catch certain impossible scenarios
-
-   {
-      char const* str = "abcd";
-      boost::regex rx(str);
-      boost::match_results<std::string::const_iterator> what;
-      std::string where(15, 'H');
-      BOOST_TEST_THROWS(boost::regex_match(where, rx, boost::match_posix | boost::match_perl), std::logic_error);
-   }
-
-   {
-      char const* str = "ab(*COMMIT)cd";
-      boost::regex rx(str);
-      boost::match_results<std::string::const_iterator> what;
-      std::string where(15, 'H');
-      BOOST_TEST_THROWS(boost::regex_match(where, rx, boost::match_posix), std::logic_error);
-   }
-
-   return boost::report_errors();
-}
-

test/lookbehind_recursion_stress_test.cpp

@@ -1,28 +0,0 @@
-/*
- *
- * Copyright (c) 2024
- * John Maddock
- *
- * Use, modification and distribution are subject to the
- * Boost Software License, Version 1.0. (See accompanying file
- * LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
- *
- */
-
-#include <boost/regex.hpp>
-
-int main()
-{
-   std::string s("(?<=(");
-   s.append(1000, '|');
-   s += "))";
-   boost::regex rx(s);
-
-   s = "(?<=(a";
-   for (unsigned i = 0; i < 1000; ++i)
-   {
-      s += "|a";
-   }
-   s += "))";
-   boost::regex rx2(s);
-}