Merge pull request #112 from glywk/develop

Add is_blank() string functor classification
Merge pull request #123 from ahamez/develop
2025-04-13 13:46:42 -07:00 · 2025-04-13 13:44:34 -07:00 · 2025-01-13 11:20:30 +01:00 · 2024-09-03 11:59:17 -07:00 · 2024-08-08 21:45:19 -05:00 · 2024-07-30 08:03:47 -05:00
14 changed files with 142 additions and 70 deletions
--- a/11
+++ b/11
@ -1,11 +0,0 @@
-#  Boost.Algorithm Library Jamfile
-#
-#  Copyright (c) 2018 James E. King III
-#
-#  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)
-
-# please order by name to ease maintenance
-build-project example ;
-build-project test ;
--- a/build.jam
+++ b/build.jam
@ -0,0 +1,42 @@
+# Copyright René Ferdinand Rivera Morell 2023-2024
+# 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)
+
+require-b2 5.2 ;
+
+constant boost_dependencies :
+    /boost/array//boost_array
+    /boost/assert//boost_assert
+    /boost/bind//boost_bind
+    /boost/concept_check//boost_concept_check
+    /boost/config//boost_config
+    /boost/core//boost_core
+    /boost/exception//boost_exception
+    /boost/function//boost_function
+    /boost/iterator//boost_iterator
+    /boost/mpl//boost_mpl
+    /boost/range//boost_range
+    /boost/regex//boost_regex
+    /boost/static_assert//boost_static_assert
+    /boost/throw_exception//boost_throw_exception
+    /boost/tuple//boost_tuple
+    /boost/type_traits//boost_type_traits
+    /boost/unordered//boost_unordered ;
+
+project /boost/algorithm
+    : common-requirements
+        <include>include
+    ;
+
+explicit
+    [ alias boost_algorithm : : : : <library>$(boost_dependencies) ]
+    [ alias all : boost_algorithm test
+        example
+        minmax/example minmax/test
+        string/example string/test
+        ]
+    ;
+
+call-if : boost-library algorithm
+    ;
--- a/doc/Jamfile.v2
+++ b/doc/Jamfile.v2
@ -16,18 +16,18 @@ using quickbook ;
 using doxygen ;
 using boostbook ;

-doxygen autodoc 
-    : 
-        [ glob ../../../boost/algorithm/*.hpp 
-               ../../../boost/algorithm/searching/*.hpp
-               ../../../boost/algorithm/cxx11/*.hpp
-               ../../../boost/algorithm/cxx14/*.hpp
-               ../../../boost/algorithm/cxx17/*.hpp
+doxygen autodoc
+    :
+        [ glob ../include/boost/algorithm/*.hpp
+               ../include/boost/algorithm/searching/*.hpp
+               ../include/boost/algorithm/cxx11/*.hpp
+               ../include/boost/algorithm/cxx14/*.hpp
+               ../include/boost/algorithm/cxx17/*.hpp
        ]
-    : 
+    :
       <doxygen:param>"PREDEFINED=\"BOOST_ALGORITHM_DOXYGEN=1\""
       <doxygen:param>WARNINGS=YES # Default NO, but useful to see warnings, especially in a logfile.
-    ; 
+    ;


 xml algorithm : algorithm.qbk ;
@ -36,7 +36,7 @@ boostbook standalone
  :
    algorithm
  :
-    <dependency>autodoc 
+    <dependency>autodoc
    <xsl:param>boost.root=../../../..
    <xsl:param>"boost.doxygen.reftitle=Boost.Algorithms C++ Reference"
    <xsl:param>chapter.autolabel=0
--- a/example/Jamfile.v2
+++ b/example/Jamfile.v2
@ -8,9 +8,9 @@
 #  See http://www.boost.org for updates, documentation, and revision history.


-project /boost/algorithm/example
+project
    : requirements
-      <include>../../../
+      <library>/boost/algorithm//boost_algorithm
      <optimization>speed
      <toolset>msvc:<define>_SCL_SECURE_NO_WARNINGS
      <toolset>msvc:<define>NOMINMAX
--- a/include/boost/algorithm/string/classification.hpp
+++ b/include/boost/algorithm/string/classification.hpp
@ -85,6 +85,22 @@ namespace boost {
            return detail::is_classifiedF(std::ctype_base::alpha, Loc);
        }

+#ifndef BOOST_NO_CXX11
+        //! is_blank predicate
+        /*!
+            Construct the \c is_classified predicate for the \c ctype_base::blank category.
+
+            \param Loc A locale used for classification
+            \return An instance of the \c is_classified predicate
+            \since c++11
+        */
+        inline detail::is_classifiedF
+        is_blank(const std::locale& Loc=std::locale())
+        {
+            return detail::is_classifiedF(std::ctype_base::blank, Loc);
+        }
+#endif
+    
        //! is_cntrl predicate
        /*!
            Construct the \c is_classified predicate for the \c ctype_base::cntrl category.   
@ -294,6 +310,9 @@ namespace boost {
    // pull names to the boost namespace
    using algorithm::is_classified;
    using algorithm::is_space;
+#ifndef BOOST_NO_CXX11
+    using algorithm::is_blank;
+#endif
    using algorithm::is_alnum;
    using algorithm::is_alpha;
    using algorithm::is_cntrl;
--- a/include/boost/algorithm/string/trim_all.hpp
+++ b/include/boost/algorithm/string/trim_all.hpp
@ -108,7 +108,6 @@ namespace boost {

            \param Input An input sequence
            \param Loc A locale used for 'space' classification
-            \return A trimmed copy of the input
        */
        template<typename SequenceT>
        inline void trim_all(SequenceT& Input, const std::locale& Loc =std::locale())
@ -191,7 +190,6 @@ namespace boost {
            \param Input An input sequence
            \param Fill A string used to fill the inner spaces
            \param Loc A locale used for 'space' classification
-            \return A trimmed copy of the input
        */
        template<typename SequenceT, typename RangeT>
        inline void trim_fill(SequenceT& Input, const RangeT& Fill, const std::locale& Loc =std::locale())
--- a/minmax/example/Jamfile
+++ b/minmax/example/Jamfile
@ -7,6 +7,11 @@
 # http://www.boost.org/LICENSE_1_0.txt)
 #

+project
+    : requirements
+        <library>/boost/algorithm//boost_algorithm
+        <library>/boost/timer//boost_timer ;
+
 exe minmax_ex : minmax_ex.cpp ;
 exe minmax_timer : minmax_timer.cpp ;

--- a/minmax/test/Jamfile.v2
+++ b/minmax/test/Jamfile.v2
@ -9,17 +9,19 @@

 import testing ;

+project : requirements <library>/boost/algorithm//boost_algorithm ;
+
 alias unit_test_framework
    : # sources
-        /boost//unit_test_framework
-    ;        
+        /boost/test//boost_unit_test_framework
+    ;

 {
  test-suite algorithm/minmax
   : [ run minmax_element_test.cpp unit_test_framework
       : : : : minmax_element ]
     [ run minmax_test.cpp unit_test_framework
-       : : : : minmax ]      
+       : : : : minmax ]
   ;
 }

--- a/string/doc/Jamfile.v2
+++ b/string/doc/Jamfile.v2
@ -10,40 +10,40 @@
 import toolset ;
 toolset.using doxygen ;

-boostbook string_algo : string_algo.xml autodoc 
+boostbook string_algo : string_algo.xml autodoc
 	:
        <xsl:param>boost.root=../../../../..
        <format>pdf:<xsl:param>boost.url.prefix=http://www.boost.org/doc/libs/release/doc/html
 	;

 doxygen autodoc
-    :   
-    [ glob ../../../../boost/algorithm/string.hpp ]
-    [ glob ../../../../boost/algorithm/string_regex.hpp ]
+    :
+    [ glob ../../include/boost/algorithm/string.hpp ]
+    [ glob ../../include/boost/algorithm/string_regex.hpp ]

-    [ glob ../../../../boost/algorithm/string/classification.hpp ]
-    [ glob ../../../../boost/algorithm/string/iterator_range.hpp ]       
-    [ glob ../../../../boost/algorithm/string/sequence_traits.hpp ]
-    [ glob ../../../../boost/algorithm/string/std_containers_traits.hpp ]
-    [ glob ../../../../boost/algorithm/string/concept.hpp ]
-    [ glob ../../../../boost/algorithm/string/compare.hpp ]
-    [ glob ../../../../boost/algorithm/string/constants.hpp ]
-    [ glob ../../../../boost/algorithm/string/case_conv.hpp ]
-    [ glob ../../../../boost/algorithm/string/find.hpp ]
-    [ glob ../../../../boost/algorithm/string/finder.hpp ]
-    [ glob ../../../../boost/algorithm/string/find_iterator.hpp ]
-    [ glob ../../../../boost/algorithm/string/trim.hpp ]
-    [ glob ../../../../boost/algorithm/string/predicate.hpp ]
-    [ glob ../../../../boost/algorithm/string/split.hpp ]
-    [ glob ../../../../boost/algorithm/string/iter_find.hpp ]
-    [ glob ../../../../boost/algorithm/string/erase.hpp ]
-    [ glob ../../../../boost/algorithm/string/join.hpp ]
-    [ glob ../../../../boost/algorithm/string/replace.hpp ]
-    [ glob ../../../../boost/algorithm/string/find_format.hpp ]
-    [ glob ../../../../boost/algorithm/string/formatter.hpp ]
-    [ glob ../../../../boost/algorithm/string/regex.hpp ]
-    [ glob ../../../../boost/algorithm/string/regex_find_format.hpp ]
-    [ glob ../../../../boost/algorithm/string/trim_all.hpp ]
+    [ glob ../../include/boost/algorithm/string/classification.hpp ]
+    [ glob ../../include/boost/algorithm/string/iterator_range.hpp ]
+    [ glob ../../include/boost/algorithm/string/sequence_traits.hpp ]
+    [ glob ../../include/boost/algorithm/string/std_containers_traits.hpp ]
+    [ glob ../../include/boost/algorithm/string/concept.hpp ]
+    [ glob ../../include/boost/algorithm/string/compare.hpp ]
+    [ glob ../../include/boost/algorithm/string/constants.hpp ]
+    [ glob ../../include/boost/algorithm/string/case_conv.hpp ]
+    [ glob ../../include/boost/algorithm/string/find.hpp ]
+    [ glob ../../include/boost/algorithm/string/finder.hpp ]
+    [ glob ../../include/boost/algorithm/string/find_iterator.hpp ]
+    [ glob ../../include/boost/algorithm/string/trim.hpp ]
+    [ glob ../../include/boost/algorithm/string/predicate.hpp ]
+    [ glob ../../include/boost/algorithm/string/split.hpp ]
+    [ glob ../../include/boost/algorithm/string/iter_find.hpp ]
+    [ glob ../../include/boost/algorithm/string/erase.hpp ]
+    [ glob ../../include/boost/algorithm/string/join.hpp ]
+    [ glob ../../include/boost/algorithm/string/replace.hpp ]
+    [ glob ../../include/boost/algorithm/string/find_format.hpp ]
+    [ glob ../../include/boost/algorithm/string/formatter.hpp ]
+    [ glob ../../include/boost/algorithm/string/regex.hpp ]
+    [ glob ../../include/boost/algorithm/string/regex_find_format.hpp ]
+    [ glob ../../include/boost/algorithm/string/trim_all.hpp ]
    :
    <doxygen:param>HIDE_UNDOC_MEMBERS=YES
    <doxygen:param>EXTRACT_PRIVATE=NO
@ -53,7 +53,7 @@ doxygen autodoc
    <doxygen:param>SEARCH_INCLUDES=YES
    <doxygen:param>PREDEFINED="BOOST_STRING_TYPENAME=typename \"BOOST_STATIC_CONSTANT(type,var)=static const type var;\""
    ;
-        
+



--- a/string/doc/quickref.xml
+++ b/string/doc/quickref.xml
@ -667,6 +667,13 @@
                            <functionname>is_space()</functionname>
                        </entry>
                    </row>
+                    <row>
+                        <entry>is_blank</entry>
+                        <entry>Recognize blanks</entry>
+                        <entry>
+                            <functionname>is_blank()</functionname>
+                        </entry>
+                    </row>
                    <row>
                        <entry>is_alnum</entry>
                        <entry>Recognize alphanumeric characters</entry>
--- a/string/example/Jamfile
+++ b/string/example/Jamfile
@ -7,6 +7,7 @@
 #
 #  See http://www.boost.org for updates, documentation, and revision history.

+project : requirements <library>/boost/algorithm//boost_algorithm ;

 exe conv_example : conv_example.cpp ;
 exe predicate_example : predicate_example.cpp ;
--- a/string/test/Jamfile.v2
+++ b/string/test/Jamfile.v2
@ -9,31 +9,33 @@

 import testing ;

+project : requirements <library>/boost/algorithm//boost_algorithm ;
+
 alias unit_test_framework
    : # sources
-        /boost//unit_test_framework
-    ;        
+        /boost/test//boost_unit_test_framework
+    ;

 test-suite algorithm/string
-    : [ run 
+    : [ run
            trim_test.cpp unit_test_framework
          : :
            :
            : trim
        ]
-      [ run 
+      [ run
            conv_test.cpp unit_test_framework
          : :
            :
            : conv
        ]
-      [ run 
+      [ run
            predicate_test.cpp unit_test_framework
          : :
            :
            : predicate
        ]
-      [ run 
+      [ run
            find_test.cpp unit_test_framework
          : :
            :
@ -51,23 +53,23 @@ test-suite algorithm/string
            :
            : join
        ]
-      [ run 
+      [ run
            replace_test.cpp unit_test_framework
          : :
            :
            : replace
        ]
-      [ run 
+      [ run
            regex_test.cpp unit_test_framework
            ../../../regex/build//boost_regex
          : :
-            :   
+            :
            : regex
        ]
-      [ run 
+      [ run
            find_format_test.cpp unit_test_framework
          : :
-            :   
+            :
            : find_format
        ]
    ;
--- a/string/test/predicate_test.cpp
+++ b/string/test/predicate_test.cpp
@ -138,7 +138,12 @@ void classification_test()
    TEST_CLASS( is_any_of( string("abc") ), "aaabbcc", "aaxb" );
    TEST_CLASS( is_any_of( "abc" ), "aaabbcc", "aaxb" );
    TEST_CLASS( is_from_range( 'a', 'c' ), "aaabbcc", "aaxb" );
-
+    
+#ifndef BOOST_NO_CXX11
+    TEST_CLASS( is_blank(), " \t", "\t \n\r" );
+    TEST_CLASS( !is_blank(), "abc\n\v\f\r", "a x\t" );
+#endif
+    
    TEST_CLASS( !is_classified(std::ctype_base::space), "...", "..\n\r\t " );
    TEST_CLASS( ( !is_any_of("abc") && is_from_range('a','e') ) || is_space(), "d e", "abcde" );

--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@ -9,9 +9,11 @@

 import testing ;

+project : requirements <library>/boost/algorithm//boost_algorithm ;
+
 alias unit_test_framework
    : # sources
-        /boost//unit_test_framework
+        /boost/test//boost_unit_test_framework
    ;


@ -85,7 +87,7 @@ alias unit_test_framework

 # Is_partitioned_until tests
     [ run is_partitioned_until_test.cpp unit_test_framework    : : : : is_partitioned_until_test ]
-   
+
 # Apply_permutation tests
     [ run apply_permutation_test.cpp unit_test_framework    : : : : apply_permutation_test ]
 # Find tests
Author	SHA1	Message	Date
Marshall Clow	6eb48dd863	Merge pull request #112 from glywk/develop Add is_blank() string functor classification	2025-04-13 13:46:42 -07:00
Marshall Clow	1395fe720c	Merge pull request #123 from ahamez/develop Fix documentation for trim_all and trim_fill	2025-04-13 13:44:34 -07:00
Alexandre Hamez	35a55238a7	Fix documentation for trim_all and trim_fill	2025-01-13 11:20:30 +01:00
Marshall Clow	7f07838f8b	Merge pull request #121 from grafikrobot/modular Add support for modular build structure.	2024-09-03 11:59:17 -07:00
Rene Rivera	bbfcdf1322	Change Boost Test build refs to work with both old and modular test lib targets.	2024-08-08 21:45:19 -05:00
Rene Rivera	5c8e6ce9ba	Add timer dependency for minmax examples.	2024-07-30 08:03:47 -05:00
Rene Rivera	0c0e84b112	Adjust self dependencies as inter-lib deps no longer apply globally.	2024-07-27 10:28:38 -05:00
Rene Rivera	81e46297b5	Move inter-lib dependencies to a project variable and into the build targets.	2024-07-23 22:34:22 -05:00
Rene Rivera	8189606c93	Update copyright dates.	2024-07-20 22:52:03 -05:00
Rene Rivera	c63c45a932	Bump B2 require to 5.2	2024-06-14 11:33:55 -05:00
Rene Rivera	1213b9fd1f	Add requires-b2 check to top-level build file.	2024-05-05 09:00:00 -05:00
Rene Rivera	b3b2ff4d0c	Remove relative references to boost-root in Jamfiles.	2024-04-13 16:18:29 -05:00
Rene Rivera	14922e71c0	Avoid global references to boost-root.	2024-04-13 11:15:55 -05:00
Rene Rivera	fcf95e504b	Switch to library requirements instead of source. As source puts extra source in install targets.	2024-03-29 21:12:36 -05:00
Rene Rivera	6b1d2fc5ad	Make the library modular usable.	2024-03-11 08:27:02 -05:00
glywk	dc14b69189	Add negative is_blank predicate tests	2023-07-27 23:15:48 +02:00
glywk	61fa3e461f	Merge branch 'boostorg:develop' into develop	2023-07-27 01:17:32 +02:00
jiayuehua	3401f0398f	fix range-base gather algorithm	2023-07-27 01:04:04 +02:00
glywk	1d9706feb7	Add is_blank classifier	2023-01-21 00:42:52 +01:00