[zypp-commit] r8813 - in /trunk/libzypp/zypp: CMakeLists.txt base/Collector.h base/Functional.h base/Iterator.h sat/Pool.h sat/Solvable.cc

Author: mlandres Date: Tue Feb 19 16:08:17 2008 New Revision: 8813 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8813&view=rev Log: added Collector: functor writing elements to an output iterator. Added: trunk/libzypp/zypp/base/Collector.h Modified: trunk/libzypp/zypp/CMakeLists.txt trunk/libzypp/zypp/base/Functional.h trunk/libzypp/zypp/base/Iterator.h trunk/libzypp/zypp/sat/Pool.h trunk/libzypp/zypp/sat/Solvable.cc Modified: trunk/libzypp/zypp/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/CMakeLists.txt?rev=8813&r1=8812&r2=8813&view=diff ============================================================================== --- trunk/libzypp/zypp/CMakeLists.txt (original) +++ trunk/libzypp/zypp/CMakeLists.txt Tue Feb 19 16:08:17 2008 @@ -205,6 +205,7 @@ ) SET( zypp_base_HEADERS + base/Collector.h base/SerialNumber.h base/Easy.h base/Random.h Added: trunk/libzypp/zypp/base/Collector.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/base/Collector.h?rev=8813&view=auto ============================================================================== --- trunk/libzypp/zypp/base/Collector.h (added) +++ trunk/libzypp/zypp/base/Collector.h Tue Feb 19 16:08:17 2008 @@ -0,0 +1,66 @@ +/*---------------------------------------------------------------------\ +| ____ _ __ __ ___ | +| |__ / \ / / . \ . \ | +| / / \ V /| _/ _/ | +| / /__ | | | | | | | +| /_____||_| |_| |_| | +| | +\---------------------------------------------------------------------*/ +/** \file zypp/base/Collector.h + * +*/ +#ifndef ZYPP_BASE_COLLECTOR_H +#define ZYPP_BASE_COLLECTOR_H + +/////////////////////////////////////////////////////////////////// +namespace zypp +{ ///////////////////////////////////////////////////////////////// +/////////////////////////////////////////////////////////////////// +namespace functor +{ ///////////////////////////////////////////////////////////////// + + /////////////////////////////////////////////////////////////////// + // + // CLASS NAME : _Collector<_OutputIterator> + // + /** Functor feeding values to an output_iterator. + * + * \code + * LocaleSet locales; + * for_each( begin(), end(), + * Collector( std::inserter( locales_r, locales_r.begin() ) ) ); + * \endcode + * + * \see Convenience constructor \ref Collector. + */ + template<class _OutputIterator> + struct _Collector + { + _Collector( _OutputIterator iter_r ) : _iter( iter_r ) {} + + template<class _Tp> + bool operator()( const _Tp & value_r ) const + { + *_iter++ = value_r; + return true; + } + + private: + mutable _OutputIterator _iter; + }; + /////////////////////////////////////////////////////////////////// + + /** \relates _Collector Convenience constructor. */ + template<class _OutputIterator> + inline _Collector<_OutputIterator> Collector( _OutputIterator iter_r ) + { return _Collector<_OutputIterator>( iter_r ); } + + /////////////////////////////////////////////////////////////////// + + ///////////////////////////////////////////////////////////////// +} // namespace functor +/////////////////////////////////////////////////////////////////// + ///////////////////////////////////////////////////////////////// +} // namespace zypp +/////////////////////////////////////////////////////////////////// +#endif // ZYPP_BASE_COLLECTOR_H Modified: trunk/libzypp/zypp/base/Functional.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/base/Functional.h?rev=8813&r1=8812&r2=8813&view=diff ============================================================================== --- trunk/libzypp/zypp/base/Functional.h (original) +++ trunk/libzypp/zypp/base/Functional.h Tue Feb 19 16:08:17 2008 @@ -12,9 +12,10 @@ #ifndef ZYPP_BASE_FUNCTIONAL_H #define ZYPP_BASE_FUNCTIONAL_H -//#include <functional> #include +#include "zypp/base/Function.h" + /////////////////////////////////////////////////////////////////// namespace zypp { ///////////////////////////////////////////////////////////////// @@ -28,7 +29,6 @@ using boost::mem_fun; using boost::mem_fun_ref; - /////////////////////////////////////////////////////////////////// namespace functor { ///////////////////////////////////////////////////////////////// Modified: trunk/libzypp/zypp/base/Iterator.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/base/Iterator.h?rev=8813&r1=8812&r2=8813&view=diff ============================================================================== --- trunk/libzypp/zypp/base/Iterator.h (original) +++ trunk/libzypp/zypp/base/Iterator.h Tue Feb 19 16:08:17 2008 @@ -13,9 +13,9 @@ #define ZYPP_BASE_ITERATOR_H #include <iterator> -#include <functional> #include <utility> +#include #include #include #include Modified: trunk/libzypp/zypp/sat/Pool.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/Pool.h?rev=8813&r1=8812&r2=8813&view=diff ============================================================================== --- trunk/libzypp/zypp/sat/Pool.h (original) +++ trunk/libzypp/zypp/sat/Pool.h Tue Feb 19 16:08:17 2008 @@ -130,7 +130,18 @@ /** Iterator behind the last \ref Solvable. */ SolvableIterator solvablesEnd() const; - public: + /** \name Iterate all Solvables matching a \c _Filter. */ + //@{ + template<class _Filter> + filter_iterator<_Filter,SolvableIterator> filterBegin( const _Filter & filter_r ) const + { return make_filter_iterator( filter_r, solvablesBegin(), solvablesEnd() ); } + + template<class _Filter> + filter_iterator<_Filter,SolvableIterator> filterEnd( const _Filter & filter_r ) const + { return make_filter_iterator( filter_r, solvablesEnd(), solvablesEnd() ); } + //@} + + public: /** Conainer of all \ref Solvable providing \c cap_r. */ WhatProvides whatProvides( Capability cap_r ) const { return WhatProvides( cap_r ); } Modified: trunk/libzypp/zypp/sat/Solvable.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/Solvable.cc?rev=8813&r1=8812&r2=8813&view=diff ============================================================================== --- trunk/libzypp/zypp/sat/Solvable.cc (original) +++ trunk/libzypp/zypp/sat/Solvable.cc Tue Feb 19 16:08:17 2008 @@ -14,8 +14,8 @@ #include "zypp/base/Logger.h" #include "zypp/base/Gettext.h" #include "zypp/base/Exception.h" -#include "zypp/base/Function.h" #include "zypp/base/Functional.h" +#include "zypp/base/Collector.h" #include "zypp/sat/detail/PoolImpl.h" #include "zypp/sat/Solvable.h" @@ -361,6 +361,10 @@ /////////////////////////////////////////////////////////////////// namespace { ///////////////////////////////////////////////////////////////// + /** Expand \ref Capability and call \c fnc_r for each namescpace:language + * dependency. Return #invocations of fnc_r, negative if fnc_r returned + * false to indicate abort. + */ int invokeOnEachSupportedLocale( Capability cap_r, function fnc_r ) { CapDetail detail( cap_r ); @@ -397,7 +401,10 @@ return 0; } - // return #invocations of fnc_r, negative if fnc_r returned false to indicate abort. + /** Expand \ref Capability and call \c fnc_r for each namescpace:language + * dependency. Return #invocations of fnc_r, negative if fnc_r returned + * false to indicate abort. + */ inline int invokeOnEachSupportedLocale( Capabilities cap_r, function fnc_r ) { int cnt = 0; @@ -410,6 +417,7 @@ } return cnt; } + //@} // Functor returning false if a Locale is in the set. struct NoMatchIn @@ -424,25 +432,6 @@ const LocaleSet & _locales; }; - template<class _OutputIterator> - struct _Collector - { - _Collector( _OutputIterator iter_r ) : _iter( iter_r ) {} - - template<class _Tp> - bool operator()( const _Tp & value_r ) const - { - *_iter++ = value_r; - return true; - } - - mutable _OutputIterator _iter; - }; - - template<class _OutputIterator> - inline _Collector<_OutputIterator> Collector( _OutputIterator iter_r ) - { return _Collector<_OutputIterator>( iter_r ); } - } ///////////////////////////////////////////////////////////////// bool Solvable::supportsLocales() const @@ -471,7 +460,7 @@ void Solvable::getSupportedLocales( LocaleSet & locales_r ) const { invokeOnEachSupportedLocale( supplements(), - Collector( std::inserter( locales_r, locales_r.begin() ) ) ); + functor::Collector( std::inserter( locales_r, locales_r.begin() ) ) ); } /****************************************************************** -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org