=== modified file 'src/SBuf.h' --- src/SBuf.h 2013-10-08 04:17:17 +0000 +++ src/SBuf.h 2013-11-29 15:16:09 +0000 @@ -607,4 +607,31 @@ return S.print(os); } +/** SBuf comparison predicate + * + * Comparison predicate for standard library containers. + */ +class SBufComparePredicate { +public: + explicit SBufComparePredicate(const SBuf s, SBufCaseSensitive caseSensitive = caseSensitive) : + compareWith(s), sensitive(caseSensitive) {} + inline bool operator() (const SBuf & checking) { return 0 == checking.compare(compareWith,sensitive); } +private: + SBuf compareWith; + SBufCaseSensitive sensitive; + SBufComparePredicate(); //no default constructor +}; + +class SBufPrefixComparePredicate { +public: + explicit SBufPrefixComparePredicate(const SBuf s, SBufCaseSensitive caseSensitive = caseSensitive) : + compareWith(s), sensitive(caseSensitive) {} + inline bool operator() (const SBuf & checking) { return 0 == checking.startsWith(compareWith,sensitive); } +private: + SBuf compareWith; + SBufCaseSensitive sensitive; + SBufPrefixComparePredicate(); //no default constructor +}; + + #endif /* SQUID_SBUF_H */ === added file 'src/SBufList.cc' --- src/SBufList.cc 1970-01-01 00:00:00 +0000 +++ src/SBufList.cc 2013-12-01 21:37:19 +0000 @@ -0,0 +1,55 @@ +#include "squid.h" +#include "SBufList.h" +#include "wordlist.h" + +#include + +bool +IsMember(const SBufList & sl, const SBuf &S, SBufCaseSensitive case_sensitive) +{ + return sl.end() != std::find_if(sl.begin(), sl.end(), + SBufComparePredicate(S,case_sensitive)); +} + +static inline SBuf::size_type +SBufListAccumulateSizes(SBuf::size_type sz, const SBuf &item) +{ + return sz + item.length(); +} + +SBuf +SBufListJoin(const SBufList &list, const SBuf &separator) +{ + // optimization: on empty list, return empty SBuf + if (list.begin() == list.end()) //empty + return SBuf(""); + + // optimization: pre-calculate needed storage + SBuf::size_type sz = 0; + std::accumulate(list.begin(), list.end(), sz, SBufListAccumulateSizes); + sz += separator.length() * list.size(); + + SBuf rv; + rv.rawSpace(sz); + + // + SBufList::const_iterator i = list.begin(); + rv.append(*i); + ++i; + for (; i!= list.end(); ++i) { + rv.append(separator); + rv.append(*i); + } + return rv; +} + +SBufList +wordlistToSBufList(wordlist *wl) +{ + SBufList rv; + while (wl != NULL) { + rv.push_back(SBuf(wl->key)); + wl = wl->next; + } + return rv; +} === added file 'src/SBufList.h' --- src/SBufList.h 1970-01-01 00:00:00 +0000 +++ src/SBufList.h 2013-12-01 21:37:19 +0000 @@ -0,0 +1,26 @@ +#ifndef SQUID_SBUFLIST_H +#define SQUID_SBUFLIST_H + +#include "SBuf.h" + +#include + +typedef std::list SBufList; + +/** check for membership + * + * \return true if the supplied SBuf is a member of the list + * \param case_sensitive one of caseSensitive or caseInsensitive + */ +bool IsMember(const SBufList &, const SBuf &, SBufCaseSensitive isCaseSensitive = caseSensitive); + +/** join a SBufList into a SBuf using the supplied separator. + */ +SBuf SBufListJoin(const SBufList &list, const SBuf &separator = SBuf("")); + +class wordlist; +/** convert a wordlist to a SBufList + */ +SBufList wordlistToSbufList(wordlist *); + +#endif /* SQUID_SBUFLIST_H */ === added file 'src/tests/testSBufList.cc' --- src/tests/testSBufList.cc 1970-01-01 00:00:00 +0000 +++ src/tests/testSBufList.cc 2013-12-01 21:37:19 +0000 @@ -0,0 +1,36 @@ +#include "squid.h" +#include "SBufList.h" +#include "testSBufList.h" + +CPPUNIT_TEST_SUITE_REGISTRATION( testSBufList ); + +SBuf literal("The quick brown fox jumped over the lazy dog"); +static int sbuf_tokens_number=9; +static SBuf tokens[]={ + SBuf("The",3), SBuf("quick",5), SBuf("brown",5), SBuf("fox",3), + SBuf("jumped",6), SBuf("over",4), SBuf("the",3), SBuf("lazy",4), + SBuf("dog",3) +}; + +void +testSBufList::testSBufListMembership() +{ + SBufList foo; + for (int j=0; j + +#include "OutOfBoundsException.h" + +class testSBufList : public CPPUNIT_NS::TestFixture +{ + CPPUNIT_TEST_SUITE( testSBufList ); + CPPUNIT_TEST( testSBufListMembership ); + CPPUNIT_TEST( testSBufListJoin ); + CPPUNIT_TEST_SUITE_END(); +protected: + void testSBufListMembership(); + void testSBufListJoin(); +}; + +#endif