feedc0de/boost_regex
1
0
Fork 0
forked from boostorg/regex
Code Pull Requests Activity

Make the library modular usable.

Browse Source
This commit is contained in:
Rene Rivera
2024-03-11 08:38:17 -05:00
parent 237e69caf6
commit 85580fd1ea
6 changed files with 92 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
build.jam Normal file
View File

@ -0,0 +1,32 @@
# Copyright René Ferdinand Rivera Morell 2023
# Distributed under 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)
import project ;
project /boost/regex
: common-requirements
<source>/boost/assert//boost_assert
<source>/boost/concept_check//boost_concept_check
<source>/boost/config//boost_config
<source>/boost/container_hash//boost_container_hash
<source>/boost/core//boost_core
<source>/boost/integer//boost_integer
<source>/boost/mpl//boost_mpl
<source>/boost/predef//boost_predef
<source>/boost/smart_ptr//boost_smart_ptr
<source>/boost/static_assert//boost_static_assert
<source>/boost/throw_exception//boost_throw_exception
<source>/boost/type_traits//boost_type_traits
<include>include
;
explicit
[ alias boost_regex : build//boost_regex ]
[ alias all : boost_regex example test ]
;
call-if : boost-library regex
: install boost_regex
;

3
build/Jamfile.v2
View File

@ -160,6 +160,3 @@ lib boost_regex : ../src/$(SOURCES) icu_options
<link>shared:<define>BOOST_REGEX_DYN_LINK=1 <link>shared:<define>BOOST_REGEX_DYN_LINK=1
<toolset>gcc-cygwin:<link>static <toolset>gcc-cygwin:<link>static
; ;
boost-install boost_regex ;

53
example/Jamfile.v2
View File

@ -4,19 +4,20 @@
# http://www.boost.org/LICENSE_1_0.txt. # http://www.boost.org/LICENSE_1_0.txt.
project project
: requirements : requirements
<source>/boost/timer//boost_timer
<threading>multi <threading>multi
<link>shared:<define>BOOST_REGEX_DYN_LINK=1 <link>shared:<define>BOOST_REGEX_DYN_LINK=1
# There are unidentified linker problems on these platforms: # There are unidentified linker problems on these platforms:
<toolset>mipspro-7.4:<link>static <toolset>mipspro-7.4:<link>static
<toolset>sun-5.9:<link>static <toolset>sun-5.9:<link>static
<toolset>msvc:<warnings>all <toolset>msvc:<warnings>all
<toolset>gcc:<warnings>all <toolset>gcc:<warnings>extra
<toolset>gcc:<cxxflags>-Wextra
<define>U_USING_ICU_NAMESPACE=0 <define>U_USING_ICU_NAMESPACE=0
#<toolset>gcc-mw:<link>static #<toolset>gcc-mw:<link>static
#<toolset>gcc-mingw:<link>static #<toolset>gcc-mingw:<link>static
<toolset>gcc-cygwin:<link>static <toolset>gcc-cygwin:<link>static
<define>BOOST_TIMER_ENABLE_DEPRECATED
; ;
rule regex-test-run ( sources + : input * : name * ) rule regex-test-run ( sources + : input * : name * )
@ -26,7 +27,7 @@ rule regex-test-run ( sources + : input * : name * )
# sources # sources
$(sources) $(sources)
# dependencies # dependencies
../build//boost_regex /boost/regex//boost_regex
: # additional args : # additional args
$(input) $(input)
: # test-files : # test-files
@ -37,45 +38,33 @@ rule regex-test-run ( sources + : input * : name * )
] ; ] ;
} }
path-constant HERE : . ;
test-suite regex-examples : test-suite regex-examples :
[ regex-test-run timer/regex_timer.cpp : $(BOOST_ROOT)/libs/regex/example/timer/input_script.txt ] [ regex-test-run timer/regex_timer.cpp : $(HERE)/timer/input_script.txt ]
[ regex-test-run grep/grep.cpp ../../program_options/build//boost_program_options/<link>static : -n -b $(BOOST_ROOT)/boost/regex.hpp $(BOOST_ROOT)/boost/type_traits.hpp : test_grep ] [ regex-test-run grep/grep.cpp /boost/program_options//boost_program_options/<link>static : -n -b $(HERE)/../include/boost/regex.hpp : test_grep ]
[ regex-test-run snippets/credit_card_example.cpp ] [ regex-test-run snippets/credit_card_example.cpp ]
[ regex-test-run snippets/mfc_example.cpp ] [ regex-test-run snippets/mfc_example.cpp ]
[ regex-test-run snippets/icu_example.cpp ] [ regex-test-run snippets/icu_example.cpp ]
[ regex-test-run snippets/partial_regex_grep.cpp : $(BOOST_ROOT)/libs/regex/index.htm ] [ regex-test-run snippets/partial_regex_grep.cpp : $(HERE)/../index.htm ]
[ regex-test-run snippets/partial_regex_iterate.cpp : $(BOOST_ROOT)/libs/regex/index.htm ] [ regex-test-run snippets/partial_regex_iterate.cpp : $(HERE)/../index.htm ]
[ regex-test-run snippets/partial_regex_match.cpp : 1234-5678-8765-4 ] [ regex-test-run snippets/partial_regex_match.cpp : 1234-5678-8765-4 ]
[ regex-test-run snippets/regex_grep_example_1.cpp : $(BOOST_ROOT)/boost/rational.hpp ] [ regex-test-run snippets/regex_grep_example_1.cpp : $(HERE)/../include/boost/regex/v5/regex_iterator.hpp ]
[ regex-test-run snippets/regex_grep_example_2.cpp : $(BOOST_ROOT)/boost/rational.hpp ] [ regex-test-run snippets/regex_grep_example_2.cpp : $(HERE)/../include/boost/regex/v5/regex_iterator.hpp ]
[ regex-test-run snippets/regex_grep_example_3.cpp : $(BOOST_ROOT)/boost/rational.hpp ] [ regex-test-run snippets/regex_grep_example_3.cpp : $(HERE)/../include/boost/regex/v5/regex_iterator.hpp ]
[ regex-test-run snippets/regex_grep_example_4.cpp : $(BOOST_ROOT)/boost/rational.hpp ] [ regex-test-run snippets/regex_grep_example_4.cpp : $(HERE)/../include/boost/regex/v5/regex_iterator.hpp ]
[ regex-test-run snippets/regex_match_example.cpp : -auto ] [ regex-test-run snippets/regex_match_example.cpp : -auto ]
[ regex-test-run snippets/regex_merge_example.cpp : $(BOOST_ROOT)/boost/rational.hpp ] [ regex-test-run snippets/regex_merge_example.cpp : $(HERE)/../include/boost/regex/v5/regex_iterator.hpp ]
[ regex-test-run snippets/regex_replace_example.cpp : $(BOOST_ROOT)/boost/rational.hpp ] [ regex-test-run snippets/regex_replace_example.cpp : $(HERE)/../include/boost/regex/v5/regex_iterator.hpp ]
[ regex-test-run snippets/regex_search_example.cpp : $(BOOST_ROOT)/boost/rational.hpp ] [ regex-test-run snippets/regex_search_example.cpp : $(HERE)/../include/boost/regex/v5/regex_iterator.hpp ]
[ regex-test-run snippets/regex_split_example_1.cpp : -auto ] [ regex-test-run snippets/regex_split_example_1.cpp : -auto ]
[ regex-test-run snippets/regex_split_example_2.cpp : $(BOOST_ROOT)/libs/regex/doc/html/index.html ] [ regex-test-run snippets/regex_split_example_2.cpp : $(HERE)/../doc/html/index.html ]
[ regex-test-run snippets/regex_token_iterator_eg_1.cpp : -auto ] [ regex-test-run snippets/regex_token_iterator_eg_1.cpp : -auto ]
[ regex-test-run snippets/regex_token_iterator_eg_2.cpp : $(BOOST_ROOT)/libs/regex/doc/html/index.html ] [ regex-test-run snippets/regex_token_iterator_eg_2.cpp : $(HERE)/../doc/html/index.html ]
[ regex-test-run snippets/regex_iterator_example.cpp : $(BOOST_ROOT)/boost/rational.hpp ] [ regex-test-run snippets/regex_iterator_example.cpp : $(HERE)/../include/boost/regex/v5/regex_iterator.hpp ]
[ run snippets/captures_example.cpp [ run snippets/captures_example.cpp
../test/captures//boost_regex_extra ../test/captures//boost_regex_extra
: : : <threading>multi <define>BOOST_REGEX_MATCH_EXTRA=1 ] : : : <threading>multi <define>BOOST_REGEX_MATCH_EXTRA=1 ]
; ;

58
test/Jamfile.v2
View File

@ -5,6 +5,7 @@
project project
: requirements : requirements
<source>/boost/detail//boost_detail
<threading>multi <threading>multi
<link>shared:<define>BOOST_REGEX_DYN_LINK=1 <link>shared:<define>BOOST_REGEX_DYN_LINK=1
<toolset>msvc-7.1:<define>TEST_MFC=1 <toolset>msvc-7.1:<define>TEST_MFC=1
@ -21,6 +22,7 @@ project
#<toolset>gcc-mingw:<link>static #<toolset>gcc-mingw:<link>static
#<toolset>gcc-cygwin:<link>static #<toolset>gcc-cygwin:<link>static
<toolset>sun:<link>static <toolset>sun:<link>static
<include>../src
; ;
# #
@ -28,7 +30,7 @@ project
# #
rule regex-test ( name : sources + : requirements * : input-files * ) rule regex-test ( name : sources + : requirements * : input-files * )
{ {
return [ run $(sources) ../build//boost_regex return [ run $(sources) /boost/regex//boost_regex
: :
: $(input-files) : $(input-files)
: $(requirements) : $(requirements)
@ -80,22 +82,22 @@ local regress-sources = regress/$(R_SOURCE) ;
test-suite regex test-suite regex
: :
[ run regress/$(R_SOURCE) ../build//boost_regex ../build//icu_options [ run regress/$(R_SOURCE) /boost/regex//boost_regex ../build//icu_options
: # command line : # command line
: # input files : # input files
: # requirements : # requirements
: regex_regress ] : regex_regress ]
[ run regress/$(R_SOURCE) ../build//boost_regex [ run regress/$(R_SOURCE) /boost/regex//boost_regex
../../thread/build//boost_thread ../build//icu_options /boost/thread//boost_thread ../build//icu_options
: # command line : # command line
: # input files : # input files
: # requirements : # requirements
<define>TEST_THREADS <define>TEST_THREADS
: regex_regress_threaded ] : regex_regress_threaded ]
[ run regress/$(R_SOURCE) ../build//boost_regex [ run regress/$(R_SOURCE) /boost/regex//boost_regex
../../thread/build//boost_thread ../build//icu_options /boost/thread//boost_thread ../build//icu_options
: # command line : # command line
: # input files : # input files
: # requirements : # requirements
@ -114,67 +116,72 @@ test-suite regex
: c_compiler_checks/wide_posix_api_check.cpp ] : c_compiler_checks/wide_posix_api_check.cpp ]
[ run pathology/bad_expression_test.cpp : : : [ run pathology/bad_expression_test.cpp : : :
[ check-target-builds ../build//is_legacy_03 : : <source>../build//boost_regex ] [ check-target-builds ../build//is_legacy_03 : : <source>/boost/regex//boost_regex ]
] ]
[ run pathology/recursion_test.cpp : : : [ run pathology/recursion_test.cpp : : :
[ check-target-builds ../build//is_legacy_03 : : <source>../build//boost_regex ] [ check-target-builds ../build//is_legacy_03 : : <source>/boost/regex//boost_regex ]
] ]
[ run named_subexpressions/named_subexpressions_test.cpp : : : [ run named_subexpressions/named_subexpressions_test.cpp : : :
[ check-target-builds ../build//is_legacy_03 : : <source>../build//boost_regex ] [ check-target-builds ../build//is_legacy_03 : : <source>/boost/regex//boost_regex ]
] ]
[ run unicode/unicode_iterator_test.cpp : : : [ run unicode/unicode_iterator_test.cpp : : :
[ check-target-builds ../build//is_legacy_03 : : <source>../build//boost_regex ] [ check-target-builds ../build//is_legacy_03 : : <source>/boost/regex//boost_regex ]
release <define>TEST_UTF8 : unicode_iterator_test_utf8 ] release <define>TEST_UTF8 : unicode_iterator_test_utf8 ]
[ run unicode/unicode_iterator_test.cpp : : : [ run unicode/unicode_iterator_test.cpp : : :
[ check-target-builds ../build//is_legacy_03 : : <source>../build//boost_regex ] [ check-target-builds ../build//is_legacy_03 : : <source>/boost/regex//boost_regex ]
release <define>TEST_UTF16 : unicode_iterator_test_utf16 ] release <define>TEST_UTF16 : unicode_iterator_test_utf16 ]
[ run unicode/unicode_casefold_test.cpp [ run unicode/unicode_casefold_test.cpp
../build//boost_regex ../build//icu_options /boost/regex//boost_regex ../build//icu_options
] ]
[ run static_mutex/static_mutex_test.cpp [ run static_mutex/static_mutex_test.cpp
../../thread/build//boost_thread ../build//boost_regex /boost/thread//boost_thread /boost/regex//boost_regex
/boost/timer//boost_timer
: : : <define>BOOST_TIMER_ENABLE_DEPRECATED
] ]
[ run object_cache/object_cache_test.cpp : : : [ run object_cache/object_cache_test.cpp : : :
[ check-target-builds ../build//is_legacy_03 : : <source>../build//boost_regex ] [ check-target-builds ../build//is_legacy_03 : : <source>/boost/regex//boost_regex ]
] ]
[ run config_info/regex_config_info.cpp [ run config_info/regex_config_info.cpp
../build//boost_regex/<link>static /boost/regex//boost_regex/<link>static
: # command line : # command line
: # input files : # input files
: <test-info>always_show_run_output : <test-info>always_show_run_output
<use>/boost/config//testing
] ]
[ run config_info/regex_config_info.cpp ../build//boost_regex [ run config_info/regex_config_info.cpp /boost/regex//boost_regex
: # command line : # command line
: # input files : # input files
: <test-info>always_show_run_output : <test-info>always_show_run_output
<use>/boost/config//testing
: regex_dll_config_info : regex_dll_config_info
] ]
[ run collate_info/collate_info.cpp ../build//boost_regex [ run collate_info/collate_info.cpp /boost/regex//boost_regex
: : : <test-info>always_show_run_output : test_collate_info ] : : : <test-info>always_show_run_output : test_collate_info ]
[ link concepts/concept_check.cpp : [ link concepts/concept_check.cpp :
[ check-target-builds ../build//is_legacy_03 : : <source>../build//boost_regex ] [ check-target-builds ../build//is_legacy_03 : : <source>/boost/regex//boost_regex ]
] ]
[ link concepts/concept_check.cpp : [ link concepts/concept_check.cpp :
<define>BOOST_REGEX_STANDALONE [ check-target-builds ../build//is_legacy_03 : : <build>no ] : standalone_concept_check <define>BOOST_REGEX_STANDALONE [ check-target-builds ../build//is_legacy_03 : : <build>no ] : standalone_concept_check
] ]
[ link concepts/icu_concept_check.cpp : [ link concepts/icu_concept_check.cpp :
<define>BOOST_REGEX_STANDALONE [ check-target-builds ../build//is_legacy_03 : : <source>../build//boost_regex ] <define>BOOST_REGEX_STANDALONE [ check-target-builds ../build//is_legacy_03 : : <source>/boost/regex//boost_regex ]
] ]
[ link concepts/icu_concept_check.cpp : [ link concepts/icu_concept_check.cpp :
[ check-target-builds ../build//is_legacy_03 : : <build>no ] : standalone_icu_concept_check [ check-target-builds ../build//is_legacy_03 : : <build>no ] : standalone_icu_concept_check
] ]
[ link concepts/range_concept_check.cpp : [ link concepts/range_concept_check.cpp :
[ check-target-builds ../build//is_legacy_03 : : <source>../build//boost_regex ] [ check-target-builds ../build//is_legacy_03 : : <source>/boost/regex//boost_regex ]
<source>/boost/range//boost_range
] ]
[ run concepts/test_bug_11988.cpp : : : [ run concepts/test_bug_11988.cpp : : :
[ check-target-builds ../build//is_legacy_03 : : <source>../build//boost_regex ] [ check-target-builds ../build//is_legacy_03 : : <source>/boost/regex//boost_regex ]
] ]
[ run [ run
@ -184,10 +191,11 @@ test-suite regex
: # additional args : # additional args
: # test-files : # test-files
: # requirements : # requirements
<source>/boost/array//boost_array
<threading>multi <threading>multi
<define>BOOST_REGEX_MATCH_EXTRA=1 <define>BOOST_REGEX_MATCH_EXTRA=1
<define>BOOST_REGEX_NO_LIB=1 <define>BOOST_REGEX_NO_LIB=1
[ check-target-builds ../build//is_legacy_03 : : <source>../build//boost_regex ] [ check-target-builds ../build//is_legacy_03 : : <source>/boost/regex//boost_regex ]
: # test name : # test name
captures_test captures_test
] ]
@ -219,7 +227,7 @@ compile test_consolidated.cpp ;
build-project ../example ; build-project ../example ;
# `quick` target (for CI) # `quick` target (for CI)
run quick.cpp ../build//boost_regex ; run quick.cpp /boost/regex//boost_regex ;
compile test_warnings.cpp compile test_warnings.cpp
: <toolset>msvc:<warnings>all <toolset>msvc:<warnings-as-errors>on : <toolset>msvc:<warnings>all <toolset>msvc:<warnings-as-errors>on
@ -239,4 +247,4 @@ compile test_windows_defs_2.cpp ;
compile test_windows_defs_3.cpp ; compile test_windows_defs_3.cpp ;
compile test_windows_defs_4.cpp ; compile test_windows_defs_4.cpp ;
run issue153.cpp : : : <toolset>msvc:<linkflags>-STACK:2097152 ; run issue153.cpp : : : "<toolset>msvc:<linkflags>-STACK:2097152" ;

2
test/config_info/regex_config_info.cpp
View File

@ -19,7 +19,7 @@
#endif #endif
#define main OLD_MAIN #define main OLD_MAIN
#include <libs/config/test/config_info.cpp> #include <config_info.cpp>
#undef main #undef main
#ifndef NEW_MAIN #ifndef NEW_MAIN
# define NEW_MAIN main # define NEW_MAIN main

10
test/test_consolidated.cpp
View File

@ -10,8 +10,8 @@
*/ */
#include <libs/regex/src/posix_api.cpp> #include <posix_api.cpp>
#include <libs/regex/src/regex.cpp> #include <regex.cpp>
#include <libs/regex/src/regex_debug.cpp> #include <regex_debug.cpp>
#include <libs/regex/src/static_mutex.cpp> #include <static_mutex.cpp>
#include <libs/regex/src/wide_posix_api.cpp> #include <wide_posix_api.cpp>