[zypp-commit] r6585 - in /trunk/libzypp/zypp/base: Regex.cc Regex.h

Author: dmacvicar Date: Fri Aug 10 16:08:24 2007 New Revision: 6585 URL: http://svn.opensuse.org/viewcvs/zypp?rev=6585&view=rev Log: adding regex wrapper implementation Added: trunk/libzypp/zypp/base/Regex.cc trunk/libzypp/zypp/base/Regex.h Added: trunk/libzypp/zypp/base/Regex.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/base/Regex.cc?rev=6585&view=auto ============================================================================== --- trunk/libzypp/zypp/base/Regex.cc (added) +++ trunk/libzypp/zypp/base/Regex.cc Fri Aug 10 16:08:24 2007 @@ -0,0 +1,78 @@ +/*---------------------------------------------------------------------\ +| ____ _ __ __ ___ | +| |__ / \ / / . \ . \ | +| / / \ V /| _/ _/ | +| / /__ | | | | | | | +| /_____||_| |_| |_| | +| | +\---------------------------------------------------------------------*/ +/** \file zypp/base/Regex.cc + * +*/ +#include <cstdio> +#include <cstdarg> + +#include <iostream> + +#include "zypp/base/Regex.h" + +using namespace zypp::str; + +regex::regex(const std::string& str, int flags) +{ + m_valid = true; + if (regcomp(&m_preg, str.c_str(), REG_EXTENDED)) + m_valid = false; +} + +regex::~regex() throw() +{ + if (m_valid) + regfree(&m_preg); +} + +bool zypp::str::regex_match(const std::string& s, smatch& matches, const regex& regex) +{ + bool r = regex.m_valid && !regexec(®ex.m_preg, s.c_str(), 12, &matches.pmatch[0], 0); + if (r) + matches.match_str = s; + return r; +} + +bool zypp::str::regex_match(const std::string& s, const regex& regex) +{ + return !regexec(®ex.m_preg, s.c_str(), 0, NULL, 0); +} + +bool zypp::str::regex_search(const std::string& s, smatch& matches, const regex& regex) +{ + bool r= regex.m_valid && !regexec(®ex.m_preg, s.c_str(), 12, &matches.pmatch[0], 0); + if (r) + matches.match_str = s; + return r; +} + +smatch::smatch() +{ + memset(&pmatch, -1, sizeof(pmatch)); +} + +std::string smatch::operator[](unsigned i) const +{ + if (i < 12 && pmatch[i].rm_so != -1) + return match_str.substr(pmatch[i].rm_so, pmatch[i].rm_eo-pmatch[i].rm_so); + return std::string(); +} + + +unsigned smatch::size() const +{ + unsigned matches = 0; + while (matches < 12 && pmatch[matches+1].rm_so != -1) { + // std::cout << "match[" << matches << "]: *" << (*this)[matches + // +1] << "*" << std::endl; + matches++; + } + + return matches; +} Added: trunk/libzypp/zypp/base/Regex.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/base/Regex.h?rev=6585&view=auto ============================================================================== --- trunk/libzypp/zypp/base/Regex.h (added) +++ trunk/libzypp/zypp/base/Regex.h Fri Aug 10 16:08:24 2007 @@ -0,0 +1,73 @@ +/*---------------------------------------------------------------------\ +| ____ _ __ __ ___ | +| |__ / \ / / . \ . \ | +| / / \ V /| _/ _/ | +| / /__ | | | | | | | +| /_____||_| |_| |_| | +| | +\---------------------------------------------------------------------*/ +/** \file zypp/base/Regex.h + * +*/ +#ifndef ZYPP_BASE_REGEX_H +#define ZYPP_BASE_REGEX_H + +#include <iosfwd> +#include <string> + +#include + +/////////////////////////////////////////////////////////////////// +namespace zypp +{ ///////////////////////////////////////////////////////////////// + /////////////////////////////////////////////////////////////////// + /** String related utilities and \ref ZYPP_STR_REGEX. + \see \ref ZYPP_STR_REGEX + */ + namespace str + { ///////////////////////////////////////////////////////////////// + + class regex { + public: + + enum RegFlags { + optimize = 0, + match_extra = 0, + icase = REG_ICASE, + nosubs = REG_NOSUB, + match_extended = REG_EXTENDED + }; + + regex(const std::string& s,int flags = match_extended); + ~regex() throw(); + + + public: + regex_t m_preg; + bool m_valid; + }; + + + class smatch { + public: + smatch(); + + std::string operator[](unsigned i) const; + + unsigned size() const; + + std::string match_str; + regmatch_t pmatch[12]; + }; + + bool regex_match(const std::string& s, str::smatch& matches, const regex& regex); + bool regex_match(const std::string& s, const regex& regex); + bool regex_search(const std::string& s, str::smatch& matches, const regex& regex); + + ///////////////////////////////////////////////////////////////// + } // namespace str + /////////////////////////////////////////////////////////////////// + ///////////////////////////////////////////////////////////////// +} // namespace zypp +/////////////////////////////////////////////////////////////////// +#endif // ZYPP_BASE_STRING_H -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org