Merge pull request #7533 from kcy1019/feature/no-boost-regex

Remove dependency on boost::regex from Whiskers

.circleci/docker/Dockerfile.clang.ubuntu1904

@@ -57,7 +57,7 @@ RUN git clone --recursive -b boost-1.69.0 https://github.com/boostorg/boost.git
     ./bootstrap.sh --with-toolset=clang --prefix=/usr; \
     ./b2 toolset=clang headers; \
     ./b2 toolset=clang variant=release \
-        system regex filesystem unit_test_framework program_options \
+        system filesystem unit_test_framework program_options \
         install -j $(($(nproc)/2)); \
     rm -rf /usr/src/boost
 

.circleci/docker/Dockerfile.ubuntu1804

@@ -34,7 +34,7 @@ RUN set -ex; \
 		build-essential \
 		software-properties-common \
 		cmake ninja-build clang++-8 \
-		libboost-regex-dev libboost-filesystem-dev libboost-test-dev libboost-system-dev \
+		libboost-filesystem-dev libboost-test-dev libboost-system-dev \
 		libboost-program-options-dev \
 		libjsoncpp-dev \
 		llvm-8-dev libz3-static-dev \

.circleci/docker/Dockerfile.ubuntu1904

@@ -34,7 +34,7 @@ RUN set -ex; \
 		build-essential \
 		software-properties-common \
 		cmake ninja-build clang++-8 libc++-8-dev libc++abi-8-dev \
-		libboost-regex-dev libboost-filesystem-dev libboost-test-dev libboost-system-dev \
+		libboost-filesystem-dev libboost-test-dev libboost-system-dev \
 		libboost-program-options-dev \
 		libjsoncpp-dev \
 		llvm-8-dev libcvc4-dev libz3-static-dev libleveldb1d \

cmake/EthCompilerSettings.cmake

@@ -133,6 +133,8 @@ elseif (DEFINED MSVC)
 	add_compile_options(-D_WIN32_WINNT=0x0600)		# declare Windows Vista API requirement
 	add_compile_options(-DNOMINMAX)					# undefine windows.h MAX && MIN macros cause it cause conflicts with std::min && std::max functions
 	add_compile_options(/utf-8)					# enable utf-8 encoding (solves warning 4819)
+	add_compile_options(-DBOOST_REGEX_NO_LIB)		# disable automatic boost::regex library selection
+	add_compile_options(-D_REGEX_MAX_STACK_COUNT=200000L)	# increase std::regex recursion depth limit
 
 	# disable empty object file warning
 	set(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS} /ignore:4221")

cmake/EthDependencies.cmake

@@ -26,7 +26,7 @@ set(ETH_SCRIPTS_DIR ${ETH_CMAKE_DIR}/scripts)
 set(Boost_USE_MULTITHREADED ON)
 option(Boost_USE_STATIC_LIBS "Link Boost statically" ON)
 
-set(BOOST_COMPONENTS "regex;filesystem;unit_test_framework;program_options;system")
+set(BOOST_COMPONENTS "filesystem;unit_test_framework;program_options;system")
 
 find_package(Boost 1.65.0 QUIET REQUIRED COMPONENTS ${BOOST_COMPONENTS})
 

libdevcore/CMakeLists.txt

@@ -34,7 +34,7 @@ set(sources
 )
 
 add_library(devcore ${sources})
-target_link_libraries(devcore PUBLIC jsoncpp Boost::boost Boost::filesystem Boost::regex Boost::system)
+target_link_libraries(devcore PUBLIC jsoncpp Boost::boost Boost::filesystem Boost::system)
 target_include_directories(devcore PUBLIC "${CMAKE_SOURCE_DIR}")
 add_dependencies(devcore solidity_BuildInfo.h)
 

libdevcore/Whiskers.cpp

@@ -25,7 +25,7 @@
 
 #include <libdevcore/Assertions.h>
 
-#include <boost/regex.hpp>
+#include <regex>
 
 using namespace std;
 using namespace dev;
@@ -72,9 +72,9 @@ string Whiskers::render() const
 
 void Whiskers::checkParameterValid(string const& _parameter) const
 {
-	static boost::regex validParam("^" + paramRegex() + "$");
+	static regex validParam("^" + paramRegex() + "$");
 	assertThrow(
-		boost::regex_match(_parameter, validParam),
+		regex_match(_parameter, validParam),
 		WhiskersError,
 		"Parameter" + _parameter + " contains invalid characters."
 	);
@@ -99,6 +99,32 @@ void Whiskers::checkParameterUnknown(string const& _parameter) const
 	);
 }
 
+namespace
+{
+template<class ReplaceCallback>
+string regex_replace(
+	string const& _source,
+	regex const& _pattern,
+	ReplaceCallback _replace,
+	regex_constants::match_flag_type _flags = regex_constants::match_default
+)
+{
+	sregex_iterator curMatch(_source.begin(), _source.end(), _pattern, _flags);
+	sregex_iterator matchEnd;
+	string::const_iterator lastMatchedPos(_source.cbegin());
+	string result;
+	while (curMatch != matchEnd)
+	{
+		result.append(curMatch->prefix().first, curMatch->prefix().second);
+		result.append(_replace(*curMatch));
+		lastMatchedPos = (*curMatch)[0].second;
+		++curMatch;
+	}
+	result.append(lastMatchedPos, _source.cend());
+	return result;
+}
+}
+
 string Whiskers::replace(
 	string const& _template,
 	StringMap const& _parameters,
@@ -106,8 +132,7 @@ string Whiskers::replace(
 	map<string, vector<StringMap>> const& _listParameters
 )
 {
-	using namespace boost;
+	static regex listOrTag("<(" + paramRegex() + ")>|<#(" + paramRegex() + ")>((?:.|\\r|\\n)*?)</\\2>|<\\?(" + paramRegex() + ")>((?:.|\\r|\\n)*?)(<!\\4>((?:.|\\r|\\n)*?))?</\\4>");
-	static regex listOrTag("<(" + paramRegex() + ")>|<#(" + paramRegex() + ")>(.*?)</\\2>|<\\?(" + paramRegex() + ")>(.*?)(<!\\4>(.*?))?</\\4>");
 	return regex_replace(_template, listOrTag, [&](match_results<string::const_iterator> _match) -> string
 	{
 		string tagName(_match[1]);

scripts/travis-emscripten/build_emscripten.sh

@@ -67,7 +67,7 @@ echo -en 'travis_fold:start:compiling_boost\\r'
 test -e "$WORKSPACE"/boost_1_70_0_install/include/boost/version.hpp || (
 cd "$WORKSPACE"/boost_1_70_0
 ./b2 toolset=emscripten link=static variant=release threading=single runtime-link=static \
-       --with-system --with-regex --with-filesystem --with-test --with-program_options cxxflags="-Wno-unused-local-typedef -Wno-variadic-macros -Wno-c99-extensions -Wno-all" \
+       --with-system --with-filesystem --with-test --with-program_options cxxflags="-Wno-unused-local-typedef -Wno-variadic-macros -Wno-c99-extensions -Wno-all" \
        --prefix="$WORKSPACE"/boost_1_70_0_install install
 )
 ln -sf "$WORKSPACE"/boost_1_70_0_install/lib/* /emsdk_portable/sdk/system/lib