Subject: [Boost-commit] svn:boost r68162 - in trunk: boost/algorithm/string boost/algorithm/string/detail libs/algorithm/string/test
From: droba_at_[hidden]
Date: 2011-01-14 18:12:35
Author: pavol_droba
Date: 2011-01-14 18:12:32 EST (Fri, 14 Jan 2011)
New Revision: 68162
URL: http://svn.boost.org/trac/boost/changeset/68162
Log:
tabs removed
Text files modified:
trunk/boost/algorithm/string/detail/formatter.hpp | 42 +++++-----
trunk/boost/algorithm/string/formatter.hpp | 32 +++---
trunk/boost/algorithm/string/trim_all.hpp | 162 ++++++++++++++++++++--------------------
trunk/libs/algorithm/string/test/replace_test.cpp | 22 ++--
trunk/libs/algorithm/string/test/trim_test.cpp | 16 +-
5 files changed, 137 insertions(+), 137 deletions(-)
Modified: trunk/boost/algorithm/string/detail/formatter.hpp
==============================================================================
--- trunk/boost/algorithm/string/detail/formatter.hpp (original)
+++ trunk/boost/algorithm/string/detail/formatter.hpp 2011-01-14 18:12:32 EST (Fri, 14 Jan 2011)
@@ -89,27 +89,27 @@
// dissect format functor ----------------------------------------------------//
- // dissect format functor
- template<typename FinderT>
- struct dissect_formatF
- {
- public:
- // Construction
- dissect_formatF(FinderT Finder) :
- m_Finder(Finder) {}
-
- // Operation
- template<typename RangeT>
- inline iterator_range<
- BOOST_STRING_TYPENAME range_const_iterator<RangeT>::type>
- operator()(const RangeT& Replace) const
- {
- return m_Finder(::boost::begin(Replace), ::boost::end(Replace));
- }
-
- private:
- FinderT m_Finder;
- };
+ // dissect format functor
+ template<typename FinderT>
+ struct dissect_formatF
+ {
+ public:
+ // Construction
+ dissect_formatF(FinderT Finder) :
+ m_Finder(Finder) {}
+
+ // Operation
+ template<typename RangeT>
+ inline iterator_range<
+ BOOST_STRING_TYPENAME range_const_iterator<RangeT>::type>
+ operator()(const RangeT& Replace) const
+ {
+ return m_Finder(::boost::begin(Replace), ::boost::end(Replace));
+ }
+
+ private:
+ FinderT m_Finder;
+ };
} // namespace detail
Modified: trunk/boost/algorithm/string/formatter.hpp
==============================================================================
--- trunk/boost/algorithm/string/formatter.hpp (original)
+++ trunk/boost/algorithm/string/formatter.hpp 2011-01-14 18:12:32 EST (Fri, 14 Jan 2011)
@@ -89,21 +89,21 @@
BOOST_STRING_TYPENAME range_value<RangeT>::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
-
- \param Finder a finder used to select a portion of the formated sequence
- \return An instance of the \c dissect_formatter object.
- */
- template<typename FinderT>
- inline detail::dissect_formatF< FinderT >
- dissect_formatter(const FinderT& Finder)
- {
- return detail::dissect_formatF<FinderT>(Finder);
- }
+ //! 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<typename FinderT>
+ inline detail::dissect_formatF< FinderT >
+ dissect_formatter(const FinderT& Finder)
+ {
+ return detail::dissect_formatF<FinderT>(Finder);
+ }
} // namespace algorithm
@@ -112,7 +112,7 @@
using algorithm::const_formatter;
using algorithm::identity_formatter;
using algorithm::empty_formatter;
- using algorithm::dissect_formatter;
+ using algorithm::dissect_formatter;
} // namespace boost
Modified: trunk/boost/algorithm/string/trim_all.hpp
==============================================================================
--- trunk/boost/algorithm/string/trim_all.hpp (original)
+++ trunk/boost/algorithm/string/trim_all.hpp 2011-01-14 18:12:32 EST (Fri, 14 Jan 2011)
@@ -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
-
- \param Input An input sequence
- \param IsSpace An unary predicate identifying spaces
- \return A trimmed copy of the input
- */
- template<typename SequenceT, typename PredicateT>
- 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.
-
- \param Input An input sequence
- \param IsSpace An unary predicate identifying spaces
- */
- template<typename SequenceT, typename PredicateT>
- 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
-
- \param Input An input sequence
- \param Loc A locale used for 'space' classification
- \return A trimmed copy of the input
- */
- template<typename SequenceT>
- 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.
-
- \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())
- {
- trim_all_if(Input, ::boost::is_space(Loc));
- }
+ //! 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<typename SequenceT, typename PredicateT>
+ 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.
+
+ \param Input An input sequence
+ \param IsSpace An unary predicate identifying spaces
+ */
+ template<typename SequenceT, typename PredicateT>
+ 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
+
+ \param Input An input sequence
+ \param Loc A locale used for 'space' classification
+ \return A trimmed copy of the input
+ */
+ template<typename SequenceT>
+ 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.
+
+ \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())
+ {
+ 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
Modified: trunk/libs/algorithm/string/test/replace_test.cpp
==============================================================================
--- trunk/libs/algorithm/string/test/replace_test.cpp (original)
+++ trunk/libs/algorithm/string/test/replace_test.cpp 2011-01-14 18:12:32 EST (Fri, 14 Jan 2011)
@@ -290,18 +290,18 @@
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 @@
replace_tail_test();
replace_range_test();
collection_comp_test();
- dissect_format_test();
+ dissect_format_test();
return 0;
}
Modified: trunk/libs/algorithm/string/test/trim_test.cpp
==============================================================================
--- trunk/libs/algorithm/string/test/trim_test.cpp (original)
+++ trunk/libs/algorithm/string/test/trim_test.cpp 2011-01-14 18:12:32 EST (Fri, 14 Jan 2011)
@@ -112,15 +112,15 @@
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 @@
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 @@
int test_main( int, char*[] )
{
trim_test();
- trim_all_test();
+ trim_all_test();
return 0;
}