diff --git a/include/boost/algorithm/string/detail/formatter.hpp b/include/boost/algorithm/string/detail/formatter.hpp index 72a351a..8e7b727 100644 --- a/include/boost/algorithm/string/detail/formatter.hpp +++ b/include/boost/algorithm/string/detail/formatter.hpp @@ -89,27 +89,27 @@ namespace boost { // dissect format functor ----------------------------------------------------// - // dissect format functor - template - struct dissect_formatF - { - public: - // Construction - dissect_formatF(FinderT Finder) : - m_Finder(Finder) {} + // dissect format functor + template + struct dissect_formatF + { + public: + // Construction + dissect_formatF(FinderT Finder) : + m_Finder(Finder) {} - // Operation - template - inline iterator_range< - BOOST_STRING_TYPENAME range_const_iterator::type> - operator()(const RangeT& Replace) const - { - return m_Finder(::boost::begin(Replace), ::boost::end(Replace)); - } + // Operation + template + inline iterator_range< + BOOST_STRING_TYPENAME range_const_iterator::type> + operator()(const RangeT& Replace) const + { + return m_Finder(::boost::begin(Replace), ::boost::end(Replace)); + } - private: - FinderT m_Finder; - }; + private: + FinderT m_Finder; + }; } // namespace detail diff --git a/include/boost/algorithm/string/formatter.hpp b/include/boost/algorithm/string/formatter.hpp index 1fcfefa..ab5921e 100644 --- a/include/boost/algorithm/string/formatter.hpp +++ b/include/boost/algorithm/string/formatter.hpp @@ -89,21 +89,21 @@ namespace boost { BOOST_STRING_TYPENAME range_value::type>(); } - //! Empty formatter - /*! - Constructs a \c dissect_formatter. Dissect formatter uses a specified finder - to extract a portion of the formatted sequence. The first finder's match is returned - as a result + //! Empty formatter + /*! + Constructs a \c dissect_formatter. Dissect formatter uses a specified finder + to extract a portion of the formatted sequence. The first finder's match is returned + as a result - \param Finder a finder used to select a portion of the formated sequence - \return An instance of the \c dissect_formatter object. - */ - template - inline detail::dissect_formatF< FinderT > - dissect_formatter(const FinderT& Finder) - { - return detail::dissect_formatF(Finder); - } + \param Finder a finder used to select a portion of the formated sequence + \return An instance of the \c dissect_formatter object. + */ + template + inline detail::dissect_formatF< FinderT > + dissect_formatter(const FinderT& Finder) + { + return detail::dissect_formatF(Finder); + } } // namespace algorithm @@ -112,7 +112,7 @@ namespace boost { using algorithm::const_formatter; using algorithm::identity_formatter; using algorithm::empty_formatter; - using algorithm::dissect_formatter; + using algorithm::dissect_formatter; } // namespace boost diff --git a/include/boost/algorithm/string/trim_all.hpp b/include/boost/algorithm/string/trim_all.hpp index 0fce694..e6c97c5 100644 --- a/include/boost/algorithm/string/trim_all.hpp +++ b/include/boost/algorithm/string/trim_all.hpp @@ -23,9 +23,9 @@ /*! \file Defines trim_all algorithms. - Just like \c trim, \c trim_all removes all trailing and leading spaces from a + Just like \c trim, \c trim_all removes all trailing and leading spaces from a sequence (string). In addition, spaces in the middle of the sequence are truncated - to just one character. Space is recognized using given locales. + to just one character. Space is recognized using given locales. Parametric (\c _if) variants use a predicate (functor) to select which characters are to be trimmed.. @@ -37,90 +37,90 @@ namespace boost { namespace algorithm { - // multi line trim ----------------------------------------------- // + // multi line trim ----------------------------------------------- // - //! Trim All - parametric - /*! - Remove all leading and trailing spaces from the input and - compress all other spaces to a single space. - The result is a trimmed copy of the input + //! Trim All - parametric + /*! + Remove all leading and trailing spaces from the input and + compress all other spaces to a single space. + The result is a trimmed copy of the input - \param Input An input sequence - \param IsSpace An unary predicate identifying spaces - \return A trimmed copy of the input - */ - template - inline SequenceT trim_all_copy_if(const SequenceT& Input, PredicateT IsSpace) - { - return - ::boost::find_format_all_copy( - ::boost::trim_copy_if(Input, IsSpace), - ::boost::token_finder(IsSpace, ::boost::token_compress_on), - ::boost::dissect_formatter(::boost::head_finder(1))); - } + \param Input An input sequence + \param IsSpace An unary predicate identifying spaces + \return A trimmed copy of the input + */ + template + inline SequenceT trim_all_copy_if(const SequenceT& Input, PredicateT IsSpace) + { + return + ::boost::find_format_all_copy( + ::boost::trim_copy_if(Input, IsSpace), + ::boost::token_finder(IsSpace, ::boost::token_compress_on), + ::boost::dissect_formatter(::boost::head_finder(1))); + } - //! Trim All - /*! - Remove all leading and trailing spaces from the input and - compress all other spaces to a single space. - The input sequence is modified in-place. + //! Trim All + /*! + Remove all leading and trailing spaces from the input and + compress all other spaces to a single space. + The input sequence is modified in-place. - \param Input An input sequence - \param IsSpace An unary predicate identifying spaces - */ - template - inline void trim_all_if(SequenceT& Input, PredicateT IsSpace) - { - ::boost::trim_if(Input, IsSpace); - ::boost::find_format_all( - Input, - ::boost::token_finder(IsSpace, ::boost::token_compress_on), - ::boost::dissect_formatter(::boost::head_finder(1))); - } + \param Input An input sequence + \param IsSpace An unary predicate identifying spaces + */ + template + inline void trim_all_if(SequenceT& Input, PredicateT IsSpace) + { + ::boost::trim_if(Input, IsSpace); + ::boost::find_format_all( + Input, + ::boost::token_finder(IsSpace, ::boost::token_compress_on), + ::boost::dissect_formatter(::boost::head_finder(1))); + } - //! Trim All - /*! - Remove all leading and trailing spaces from the input and - compress all other spaces to a single space. - The result is a trimmed copy of the input + //! Trim All + /*! + Remove all leading and trailing spaces from the input and + compress all other spaces to a single space. + The result is a trimmed copy of the input - \param Input An input sequence - \param Loc A locale used for 'space' classification - \return A trimmed copy of the input - */ - template - inline SequenceT trim_all_copy(const SequenceT& Input, const std::locale& Loc =std::locale()) - { - return trim_all_copy_if(Input, ::boost::is_space(Loc)); - } + \param Input An input sequence + \param Loc A locale used for 'space' classification + \return A trimmed copy of the input + */ + template + inline SequenceT trim_all_copy(const SequenceT& Input, const std::locale& Loc =std::locale()) + { + return trim_all_copy_if(Input, ::boost::is_space(Loc)); + } - //! Trim All - /*! - Remove all leading and trailing spaces from the input and - compress all other spaces to a single space. - The input sequence is modified in-place. + //! Trim All + /*! + Remove all leading and trailing spaces from the input and + compress all other spaces to a single space. + The input sequence is modified in-place. - \param Input An input sequence - \param Loc A locale used for 'space' classification - \return A trimmed copy of the input - */ - template - inline void trim_all(SequenceT& Input, const std::locale& Loc =std::locale()) - { - trim_all_if(Input, ::boost::is_space(Loc)); - } + \param Input An input sequence + \param Loc A locale used for 'space' classification + \return A trimmed copy of the input + */ + template + inline void trim_all(SequenceT& Input, const std::locale& Loc =std::locale()) + { + trim_all_if(Input, ::boost::is_space(Loc)); + } } // namespace algorithm - // pull names to the boost namespace - using algorithm::trim_all; - using algorithm::trim_all_if; - using algorithm::trim_all_copy; - using algorithm::trim_all_copy_if; + // pull names to the boost namespace + using algorithm::trim_all; + using algorithm::trim_all_if; + using algorithm::trim_all_copy; + using algorithm::trim_all_copy_if; } // namespace boost diff --git a/string/test/replace_test.cpp b/string/test/replace_test.cpp index 9d335e4..7264ea9 100644 --- a/string/test/replace_test.cpp +++ b/string/test/replace_test.cpp @@ -290,18 +290,18 @@ void collection_comp_test() void dissect_format_test() { - BOOST_CHECK( - find_format_all_copy( - string("aBc123Abc"), - first_finder("abc", is_iequal()), - dissect_formatter(token_finder(is_upper())))=="B123A"); + BOOST_CHECK( + find_format_all_copy( + string("aBc123Abc"), + first_finder("abc", is_iequal()), + dissect_formatter(token_finder(is_upper())))=="B123A"); - BOOST_CHECK( - find_format_all_copy( - string("abc 123 abc"), - token_finder(is_space(), token_compress_on), - dissect_formatter(head_finder(1)))=="abc 123 abc"); + BOOST_CHECK( + find_format_all_copy( + string("abc 123 abc"), + token_finder(is_space(), token_compress_on), + dissect_formatter(head_finder(1)))=="abc 123 abc"); } @@ -317,7 +317,7 @@ int test_main( int, char*[] ) replace_tail_test(); replace_range_test(); collection_comp_test(); - dissect_format_test(); + dissect_format_test(); return 0; } diff --git a/string/test/trim_test.cpp b/string/test/trim_test.cpp index 55c7b83..6ab8057 100644 --- a/string/test/trim_test.cpp +++ b/string/test/trim_test.cpp @@ -112,15 +112,15 @@ void trim_test() void trim_all_test() { - string str1(" 1x x x x1 "); - string str2(" 2x x x x2 "); + string str1(" 1x x x x1 "); + string str2(" 2x x x x2 "); string str3(" "); // *** value passing tests *** // // general string test BOOST_CHECK( trim_all_copy( str1 )=="1x x x x1" ) ; - BOOST_CHECK( trim_all_copy( str2 )=="2x x x x2" ) ; + BOOST_CHECK( trim_all_copy( str2 )=="2x x x x2" ) ; // spaces-only string test BOOST_CHECK( trim_all_copy( str3 )=="" ); @@ -129,10 +129,10 @@ void trim_all_test() BOOST_CHECK( trim_all_copy( string("") )=="" ); // general string test - trim_all( str1 ); - BOOST_CHECK( str1=="1x x x x1" ) ; - trim_all( str2 ); - BOOST_CHECK( str2=="2x x x x2" ) ; + trim_all( str1 ); + BOOST_CHECK( str1=="1x x x x1" ) ; + trim_all( str2 ); + BOOST_CHECK( str2=="2x x x x2" ) ; // spaces-only string test str3 = " "; trim_all( str3 ); @@ -155,7 +155,7 @@ void trim_all_test() int test_main( int, char*[] ) { trim_test(); - trim_all_test(); + trim_all_test(); return 0; }