Author: jkupec Date: Tue Dec 4 10:48:45 2007 New Revision: 8015 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8015&view=rev Log: - getting rid of some boost dependencies (thanx dmueller #344941) Modified: trunk/zypper/src/CMakeLists.txt trunk/zypper/src/zypper-search.cc trunk/zypper/src/zypper-search.h Modified: trunk/zypper/src/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/CMakeLists.txt?rev=8015&r1=8014&r2=8015&view=diff ============================================================================== --- trunk/zypper/src/CMakeLists.txt (original) +++ trunk/zypper/src/CMakeLists.txt Tue Dec 4 10:48:45 2007 @@ -39,7 +39,7 @@ ADD_EXECUTABLE( zypper ${zypper_SRCS} ) -TARGET_LINK_LIBRARIES( zypper ${ZYPP_LIBRARY} ${READLINE_LIBRARY} boost_regex ) +TARGET_LINK_LIBRARIES( zypper ${ZYPP_LIBRARY} ${READLINE_LIBRARY} ) INSTALL( TARGETS zypper Modified: trunk/zypper/src/zypper-search.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-search.cc?rev=8015&r1=8014&r2=8015&view=diff ============================================================================== --- trunk/zypper/src/zypper-search.cc (original) +++ trunk/zypper/src/zypper-search.cc Tue Dec 4 10:48:45 2007 @@ -333,18 +333,18 @@ cout_vv << "using regex: " << regstr << endl; // regex flags - unsigned int flags = boost::regex::normal; + unsigned int flags = zypp::str::regex::normal; if (!_options.caseSensitive()) - flags |= boost::regex_constants::icase; + flags |= zypp::str::regex::icase; // create regex object try { _reg.assign(regstr, flags); } - catch (regex_error & e) { + catch (zypp::str::regex_error & e) { cerr << "ZyppSearch::setupRegexp(): " << regstr << _(" is not a valid regular expression: \"") - << e.what() << "\"" << endl; + << regstr << "\"" << endl; cerr << _("This is a bug, please file a bug report against zypper.") << endl; exit(1); } @@ -354,19 +354,23 @@ * Converts '*' and '?' wildcards within str into their regex equivalents. */ string ZyppSearch::wildcards2regex(const string & str) const { - string regexed; + string regexed = str; - regex all("\\*"); // regex to search for '*' - regex one("\\?"); // regex to search for '?' - string r_all(".*"); // regex equivalent of '*' - string r_one("."); // regex equivalent of '?' + zypp::str::regex all("\\*"); // regex to search for '*' + zypp::str::regex one("\\?"); // regex to search for '?' + std::string r_all(".*"); // regex equivalent of '*' + std::string r_one("."); // regex equivalent of '?' + std::string::size_type pos; // replace all "*" in input with ".*" - regexed = regex_replace(str, all, r_all); - cerr_vv << "wildcards2regex: " << str << " -> " << regexed; + for (pos = 0; (pos = regexed.find("*", pos)) != std::string::npos; pos+=2) + regexed = regexed.replace(pos, 1, r_all); + cerr_vv << "wildcards2regex: " << str << " -> " << regexed << std::endl; // replace all "?" in input with "." - regexed = regex_replace(regexed, one, r_one); + for (pos = 0; (pos = regexed.find('?', pos)) != std::string::npos; ++pos) + regexed = regexed.replace(pos, 1, r_one); + cerr_vv << " -> " << regexed << endl; return regexed; Modified: trunk/zypper/src/zypper-search.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-search.h?rev=8015&r1=8014&r2=8015&view=diff ============================================================================== --- trunk/zypper/src/zypper-search.h (original) +++ trunk/zypper/src/zypper-search.h Tue Dec 4 10:48:45 2007 @@ -13,10 +13,10 @@ #include <string> #include <vector> -#include #include #include "zypp/ZYpp.h" #include "zypp/base/Hash.h" +#include "zypp/base/Regex.h" #include "zypp/cache/ResolvableQuery.h" #include "zypp/RepoManager.h" @@ -221,7 +221,7 @@ zypp::ZYpp::Ptr & _zypp; const ZyppSearchOptions & _options; const std::vectorstd::string _qstrings; - boost::regex _reg; + zypp::str::regex _reg; InstalledCache _icache; IdCache _idcache; @@ -390,10 +390,10 @@ * descriptions) with a regex created according to search criteria. */ struct Match { - const boost::regex * _regex; + const zypp::str::regex * _regex; const bool _search_descs; - Match(const boost::regex & regex, bool search_descriptions = false) : + Match(const zypp::str::regex & regex, bool search_descriptions = false) : _regex(®ex), _search_descs(search_descriptions) {} -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org