Branch for Iostreams development

[SVN r42144]
merging changes from 1.34
2007-12-18 20:08:11 +00:00 · 2007-11-02 21:00:08 +00:00 · 2007-11-02 20:55:26 +00:00 · 2007-10-27 22:52:29 +00:00 · 2007-09-28 07:19:29 +00:00 · 2007-09-25 08:46:31 +00:00
9 changed files with 70 additions and 28 deletions
--- a/include/boost/algorithm/string/find.hpp
+++ b/include/boost/algorithm/string/find.hpp
@ -17,8 +17,6 @@
 #include <boost/range/begin.hpp>
 #include <boost/range/end.hpp>
 #include <boost/range/iterator.hpp>
-#include <boost/range/const_iterator.hpp>
-#include <boost/range/result_iterator.hpp>
 #include <boost/range/as_literal.hpp>

 #include <boost/algorithm/string/finder.hpp>
@ -50,7 +48,7 @@ namespace boost {
        */
        template<typename RangeT, typename FinderT>
        inline iterator_range< 
-            BOOST_STRING_TYPENAME range_result_iterator<RangeT>::type>
+            BOOST_STRING_TYPENAME range_iterator<RangeT>::type>
        find( 
            RangeT& Input, 
            const FinderT& Finder)
@ -78,7 +76,7 @@ namespace boost {
        */
        template<typename Range1T, typename Range2T>
        inline iterator_range< 
-            BOOST_STRING_TYPENAME range_result_iterator<Range1T>::type>
+            BOOST_STRING_TYPENAME range_iterator<Range1T>::type>
        find_first( 
            Range1T& Input, 
            const Range2T& Search)
@ -104,7 +102,7 @@ namespace boost {
        */
        template<typename Range1T, typename Range2T>
        inline iterator_range< 
-            BOOST_STRING_TYPENAME range_result_iterator<Range1T>::type>
+            BOOST_STRING_TYPENAME range_iterator<Range1T>::type>
        ifind_first( 
            Range1T& Input, 
            const Range2T& Search,
@ -131,7 +129,7 @@ namespace boost {
        */
        template<typename Range1T, typename Range2T>
        inline iterator_range< 
-            BOOST_STRING_TYPENAME range_result_iterator<Range1T>::type>
+            BOOST_STRING_TYPENAME range_iterator<Range1T>::type>
        find_last( 
            Range1T& Input, 
            const Range2T& Search)
@ -157,7 +155,7 @@ namespace boost {
        */
        template<typename Range1T, typename Range2T>
        inline iterator_range< 
-            BOOST_STRING_TYPENAME range_result_iterator<Range1T>::type>
+            BOOST_STRING_TYPENAME range_iterator<Range1T>::type>
        ifind_last( 
            Range1T& Input, 
            const Range2T& Search,
@ -185,7 +183,7 @@ namespace boost {
        */
        template<typename Range1T, typename Range2T>
        inline iterator_range< 
-            BOOST_STRING_TYPENAME range_result_iterator<Range1T>::type>
+            BOOST_STRING_TYPENAME range_iterator<Range1T>::type>
        find_nth( 
            Range1T& Input, 
            const Range2T& Search,
@ -215,7 +213,7 @@ namespace boost {
        */
        template<typename Range1T, typename Range2T>
        inline iterator_range< 
-            BOOST_STRING_TYPENAME range_result_iterator<Range1T>::type>
+            BOOST_STRING_TYPENAME range_iterator<Range1T>::type>
        ifind_nth( 
            Range1T& Input, 
            const Range2T& Search,
@ -247,7 +245,7 @@ namespace boost {
        */
        template<typename RangeT>
        inline iterator_range< 
-            BOOST_STRING_TYPENAME range_result_iterator<RangeT>::type>
+            BOOST_STRING_TYPENAME range_iterator<RangeT>::type>
        find_head( 
            RangeT& Input, 
            int N)
@ -278,7 +276,7 @@ namespace boost {
        */
        template<typename RangeT>
        inline iterator_range< 
-            BOOST_STRING_TYPENAME range_result_iterator<RangeT>::type>
+            BOOST_STRING_TYPENAME range_iterator<RangeT>::type>
        find_tail( 
            RangeT& Input, 
            int N)
@ -307,7 +305,7 @@ namespace boost {
        */
        template<typename RangeT, typename PredicateT>
        inline iterator_range< 
-            BOOST_STRING_TYPENAME range_result_iterator<RangeT>::type>
+            BOOST_STRING_TYPENAME range_iterator<RangeT>::type>
        find_token( 
            RangeT& Input,
            PredicateT Pred,
--- a/include/boost/algorithm/string/find_format.hpp
+++ b/include/boost/algorithm/string/find_format.hpp
@ -17,6 +17,7 @@
 #include <boost/range/begin.hpp>
 #include <boost/range/end.hpp>
 #include <boost/range/const_iterator.hpp>
+#include <boost/range/as_literal.hpp>

 #include <boost/algorithm/string/concept.hpp>
 #include <boost/algorithm/string/detail/find_format.hpp>
--- a/include/boost/algorithm/string/find_iterator.hpp
+++ b/include/boost/algorithm/string/find_iterator.hpp
@ -18,7 +18,7 @@
 #include <boost/range/iterator_range.hpp>
 #include <boost/range/begin.hpp>
 #include <boost/range/end.hpp>
-#include <boost/range/result_iterator.hpp>
+#include <boost/range/iterator.hpp>
 #include <boost/range/as_literal.hpp>

 #include <boost/algorithm/string/detail/find_iterator.hpp>
@ -185,12 +185,12 @@ namespace boost {
         */
        template<typename RangeT, typename FinderT>
        inline find_iterator< 
-            BOOST_STRING_TYPENAME range_result_iterator<RangeT>::type>
+            BOOST_STRING_TYPENAME range_iterator<RangeT>::type>
        make_find_iterator(
            RangeT& Collection,
            FinderT Finder)
        {
-            return find_iterator<BOOST_STRING_TYPENAME range_result_iterator<RangeT>::type>(
+            return find_iterator<BOOST_STRING_TYPENAME range_iterator<RangeT>::type>(
                Collection, Finder);
        }

@ -363,12 +363,12 @@ namespace boost {
         */
        template<typename RangeT, typename FinderT>
        inline split_iterator< 
-            BOOST_STRING_TYPENAME range_result_iterator<RangeT>::type>
+            BOOST_STRING_TYPENAME range_iterator<RangeT>::type>
        make_split_iterator(
            RangeT& Collection,
            FinderT Finder)
        {
-            return split_iterator<BOOST_STRING_TYPENAME range_result_iterator<RangeT>::type>(
+            return split_iterator<BOOST_STRING_TYPENAME range_iterator<RangeT>::type>(
                Collection, Finder);
        }

--- a/include/boost/algorithm/string/iter_find.hpp
+++ b/include/boost/algorithm/string/iter_find.hpp
@ -19,7 +19,7 @@
 #include <boost/range/iterator_range.hpp>
 #include <boost/range/begin.hpp>
 #include <boost/range/end.hpp>
-#include <boost/range/result_iterator.hpp>
+#include <boost/range/iterator.hpp>
 #include <boost/range/value_type.hpp>
 #include <boost/range/as_literal.hpp>

@ -76,12 +76,12 @@ namespace boost {
        {
            function_requires< 
                FinderConcept<FinderT,
-                BOOST_STRING_TYPENAME range_result_iterator<RangeT>::type> >();
+                BOOST_STRING_TYPENAME range_iterator<RangeT>::type> >();

            iterator_range<BOOST_STRING_TYPENAME range_iterator<RangeT>::type> lit_input(as_literal(Input));

            typedef BOOST_STRING_TYPENAME 
-                range_result_iterator<RangeT>::type input_iterator_type;
+                range_iterator<RangeT>::type input_iterator_type;
            typedef find_iterator<input_iterator_type> find_iterator_type;
            typedef detail::copy_iterator_rangeF<
                BOOST_STRING_TYPENAME 
@ -145,12 +145,12 @@ namespace boost {
        {
            function_requires< 
                FinderConcept<FinderT,
-                BOOST_STRING_TYPENAME range_result_iterator<RangeT>::type> >();
+                BOOST_STRING_TYPENAME range_iterator<RangeT>::type> >();

            iterator_range<BOOST_STRING_TYPENAME range_iterator<RangeT>::type> lit_input(as_literal(Input));

            typedef BOOST_STRING_TYPENAME 
-                range_result_iterator<RangeT>::type input_iterator_type;
+                range_iterator<RangeT>::type input_iterator_type;
            typedef split_iterator<input_iterator_type> find_iterator_type;
            typedef detail::copy_iterator_rangeF<
                BOOST_STRING_TYPENAME 
--- a/include/boost/algorithm/string/join.hpp
+++ b/include/boost/algorithm/string/join.hpp
@ -14,7 +14,7 @@
 #include <boost/algorithm/string/config.hpp>
 #include <boost/algorithm/string/detail/sequence.hpp>
 #include <boost/range/value_type.hpp>
-
+#include <boost/range/as_literal.hpp>

 /*! \file
    Defines join algorithm. 
--- a/include/boost/algorithm/string/regex.hpp
+++ b/include/boost/algorithm/string/regex.hpp
@ -17,7 +17,7 @@
 #include <boost/range/iterator_range.hpp>
 #include <boost/range/begin.hpp>
 #include <boost/range/end.hpp>
-#include <boost/range/result_iterator.hpp>
+#include <boost/range/iterator.hpp>
 #include <boost/range/as_literal.hpp>

 #include <boost/algorithm/string/find_format.hpp>
@ -54,7 +54,7 @@ namespace boost {
            typename CharT, 
            typename RegexTraitsT>
        inline iterator_range< 
-            BOOST_STRING_TYPENAME range_result_iterator<RangeT>::type >
+            BOOST_STRING_TYPENAME range_iterator<RangeT>::type >
        find_regex( 
            RangeT& Input, 
            const basic_regex<CharT, RegexTraitsT>& Rx,
@ -634,6 +634,12 @@ namespace boost {
    using algorithm::find_all_regex;
    using algorithm::split_regex;

+#ifndef BOOST_NO_FUNCTION_TEMPLATE_ORDERING
+    using algorithm::join_if;
+#else  // BOOST_NO_FUNCTION_TEMPLATE_ORDERING
+    using algorithm::join_if_regex;
+#endif // BOOST_NO_FUNCTION_TEMPLATE_ORDERING
+
 } // namespace boost


--- a/string/doc/Jamfile.v2
+++ b/string/doc/Jamfile.v2
@ -31,6 +31,7 @@ doxygen autodoc
    [ 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 ]
--- a/string/doc/quickref.xml
+++ b/string/doc/quickref.xml
@ -151,7 +151,7 @@
                    </row>
                    <row>
                        <entry><code>lexicographical_compare</code></entry>
-                        <entry>Check if a string is lexicographicaly less then another one</entry>
+                        <entry>Check if a string is lexicographically less then another one</entry>
                        <entry>
                            <functionname>lexicographical_compare()</functionname>
                            <sbr/>
@ -443,6 +443,20 @@
                            <functionname>split_regex()</functionname>
                        </entry>
 					</row>
+					<row>
+						<entry>iter_find</entry>
+						<entry>Iteratively apply the finder to the input to find all matching substrings</entry>
+						<entry>
+							<functionname>iter_find()</functionname>
+						</entry>
+					</row>
+					<row>
+						<entry>iter_split</entry>
+						<entry>Use the finder to find matching substrings in the input and use them as separators to split the input into parts</entry>
+						<entry>
+							<functionname>iter_split()</functionname>
+						</entry>
+					</row>
                </tbody>
            </tgroup>
        </table>
--- a/string/doc/release_notes.xml
+++ b/string/doc/release_notes.xml
@ -8,6 +8,10 @@
 -->

 <section id="string_algo.release_notes" last-revision="$Date$">
+
+    <using-namespace name="boost"/>
+    <using-namespace name="boost::algorithm"/>
+
    <title>Release Notes</title>

    <itemizedlist>
@ -19,5 +23,23 @@
            <para><emphasis role="bold">1.33</emphasis></para>
            <para>Internal version of collection traits removed, library adapted to Boost.Range</para>
        </listitem>
+        <listitem>
+            <para><emphasis role="bold">1.34</emphasis></para>
+            <itemizedlist>
+                <listitem>
+                    <functionname>lexicographical_compare()</functionname>
+                </listitem>
+                <listitem>
+                    <functionname>join()</functionname> and <functionname>join_if()</functionname> 
+                </listitem>
+                <listitem>
+                    New comparison predicates <code>is_less</code>, <code>is_not_greater</code>
+                </listitem>
+                <listitem>
+                     Negative indexes support (like Perl) in various algorihtms
+                     (<code>*_head/tail</code>, <code>*_nth</code>).
+                </listitem>                                      
+            </itemizedlist>
+        </listitem>
    </itemizedlist>
 </section>
Author	SHA1	Message	Date
Jonathan Turkanis	d1551fb671	Branch for Iostreams development [SVN r42144]	2007-12-18 20:08:11 +00:00
Pavol Droba	5b24f31486	merging changes from 1.34 [SVN r40698]	2007-11-02 21:00:08 +00:00
Pavol Droba	b25d6511b3	merging changes from 1.34 [SVN r40697]	2007-11-02 20:55:26 +00:00
Thorsten Jørgen Ottosen	1541a554f5	changed range_result_iterator to range_iterator [SVN r40518]	2007-10-27 22:52:29 +00:00
Markus Schöpflin	7a97b3390e	Added missing include. [SVN r39586]	2007-09-28 07:19:29 +00:00
Markus Schöpflin	6e5a7497ae	Added missing include. [SVN r39519]	2007-09-25 08:46:31 +00:00