Author: dmacvicar
Date: Fri Aug 10 16:08:41 2007
New Revision: 6605
URL: http://svn.opensuse.org/viewcvs/zypp?rev=6605&view=rev
Log:
- adapting regex code
Modified:
trunk/libzypp/zypp/Locks.cc
trunk/libzypp/zypp/Locks.h
trunk/libzypp/zypp/base/Regex.cc
trunk/libzypp/zypp/base/Regex.h
trunk/libzypp/zypp/base/String.cc
trunk/libzypp/zypp/base/String.h
trunk/libzypp/zypp/repo/RepoVariables.cc
Modified: trunk/libzypp/zypp/Locks.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Locks.cc?rev=6605&r1=6604&r2=6605&view=diff
==============================================================================
--- trunk/libzypp/zypp/Locks.cc (original)
+++ trunk/libzypp/zypp/Locks.cc Fri Aug 10 16:08:41 2007
@@ -9,9 +9,10 @@
#include <set>
#include <fstream>
-#include
#include
+#include
+#include
#include "zypp/base/Logger.h"
#include "zypp/base/IOStream.h"
#include "zypp/PoolItem.h"
@@ -27,8 +28,7 @@
using namespace std;
using namespace zypp;
-using namespace boost;
-using boost::regex;
+using namespace zypp::str;
namespace zypp
{
@@ -76,18 +76,18 @@
{
string regexed;
- regex all("\\*"); // regex to search for '*'
- regex one("\\?"); // regex to search for '?'
+ string all("*"); // regex to search for '*'
+ string one("?"); // regex to search for '?'
string r_all(".*"); // regex equivalent of '*'
string r_one("."); // regex equivalent of '?'
// replace all "*" in input with ".*"
- regexed = regex_replace(str, all, r_all);
+ regexed = str::gsub( str, all, r_all );
MIL << "wildcards2regex: " << str << " -> " << regexed;
// replace all "?" in input with "."
- regexed = regex_replace(regexed, one, r_one);
- MIL << " -> " << regexed << endl;
+ regexed = str::gsub(regexed, one, r_one);
+ MIL << " -> " << regexed << endl;
return regexed;
}
@@ -176,7 +176,7 @@
// regex flags
unsigned int flags = regex::normal;
- flags |= regex_constants::icase;
+ flags |= regex::icase;
regex reg;
// create regex object
@@ -188,7 +188,7 @@
}
catch (regex_error & e)
{
- ERR << "locks: " << regstr << " is not a valid regular expression: \"" << e.what() << "\"" << endl;
+ ERR << "locks: " << regstr << " is not a valid regular expression: \"" << e.msg() << "\"" << endl;
ERR << "This is a bug, please file a bug report against libzypp-zmd-backend" << endl;
// ignore this lock and continue
return true;;
Modified: trunk/libzypp/zypp/Locks.h
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Locks.h?rev=6605&r1=6604&r2=6605&view=diff
==============================================================================
--- trunk/libzypp/zypp/Locks.h (original)
+++ trunk/libzypp/zypp/Locks.h Fri Aug 10 16:08:41 2007
@@ -14,4 +14,5 @@
}
}
-#endif
\ No newline at end of file
+#endif
+
Modified: trunk/libzypp/zypp/base/Regex.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/base/Regex.cc?rev=6605&r1=6604&r2=6605&view=diff
==============================================================================
--- trunk/libzypp/zypp/base/Regex.cc (original)
+++ trunk/libzypp/zypp/base/Regex.cc Fri Aug 10 16:08:41 2007
@@ -16,13 +16,35 @@
#include "zypp/base/Regex.h"
+using namespace zypp;
using namespace zypp::str;
-regex::regex(const std::string& str, int flags)
+regex::regex()
+ : m_valid(false)
+{
+
+}
+
+void regex::assign(const std::string& str,int flags)
{
m_valid = true;
- if (regcomp(&m_preg, str.c_str(), REG_EXTENDED | flags))
+ int err;
+ char errbuff[100];
+ if (!(flags & normal)) {
+ flags |= match_extended;
+ flags &= ~(normal);
+ }
+
+ if ((err = regcomp(&m_preg, str.c_str(), flags))) {
m_valid = false;
+ regerror(err, &m_preg, errbuff, sizeof(errbuff));
+ ZYPP_THROW(regex_error(std::string(errbuff)));
+ }
+}
+
+regex::regex(const std::string& str, int flags)
+{
+ assign(str, flags);
}
regex::~regex() throw()
@@ -51,7 +73,7 @@
std::string smatch::operator[](unsigned i) const
{
- if (i < 12 && pmatch[i].rm_so != -1)
+ if (i < sizeof(pmatch)/sizeof(*pmatch) && pmatch[i].rm_so != -1)
return match_str.substr(pmatch[i].rm_so, pmatch[i].rm_eo-pmatch[i].rm_so);
return std::string();
}
@@ -60,7 +82,7 @@
unsigned smatch::size() const
{
unsigned matches = 0;
- while (matches < 12 && pmatch[matches+1].rm_so != -1) {
+ while (matches < ((sizeof(pmatch)/sizeof(*pmatch))-1) && pmatch[matches+1].rm_so != -1) {
// std::cout << "match[" << matches << "]: *" << (*this)[matches
// +1] << "*" << std::endl;
matches++;
Modified: trunk/libzypp/zypp/base/Regex.h
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/base/Regex.h?rev=6605&r1=6604&r2=6605&view=diff
==============================================================================
--- trunk/libzypp/zypp/base/Regex.h (original)
+++ trunk/libzypp/zypp/base/Regex.h Fri Aug 10 16:08:41 2007
@@ -17,6 +17,8 @@
#include
+#include "zypp/base/Exception.h"
+
///////////////////////////////////////////////////////////////////
namespace zypp
{ /////////////////////////////////////////////////////////////////
@@ -27,6 +29,14 @@
namespace str
{ /////////////////////////////////////////////////////////////////
+ typedef Exception regex_error;
+
+ class smatch;
+ class regex;
+
+ bool regex_match(const std::string& s, str::smatch& matches, const regex& regex);
+ bool regex_match(const std::string& s, const regex& regex);
+
class regex {
public:
@@ -35,18 +45,24 @@
match_extra = 0,
icase = REG_ICASE,
nosubs = REG_NOSUB,
- match_extended = REG_EXTENDED
+ match_extended = REG_EXTENDED,
+ normal = 1<<16
};
-
+
+ regex();
regex(const std::string& s,int flags = match_extended);
~regex() throw();
- public:
+ void assign(const std::string& s,int flags = match_extended);
+
+ private:
+ friend class smatch;
+ friend bool regex_match(const std::string& s, str::smatch& matches, const regex& regex);
+ friend bool regex_match(const std::string& s, const regex& regex);
regex_t m_preg;
bool m_valid;
};
-
class smatch {
public:
smatch();
@@ -59,8 +75,7 @@
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);
+
/////////////////////////////////////////////////////////////////
} // namespace str
Modified: trunk/libzypp/zypp/base/String.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/base/String.cc?rev=6605&r1=6604&r2=6605&view=diff
==============================================================================
--- trunk/libzypp/zypp/base/String.cc (original)
+++ trunk/libzypp/zypp/base/String.cc Fri Aug 10 16:08:41 2007
@@ -16,6 +16,8 @@
#include "zypp/base/String.h"
+using std::string;
+
///////////////////////////////////////////////////////////////////
namespace zypp
{ /////////////////////////////////////////////////////////////////
@@ -155,6 +157,29 @@
return ret;
}
+ string gsub(const string& sData, const string& sFrom, const string& sTo)
+ {
+ string sNew = sData;
+
+ if (! sNew.empty())
+ {
+ string::size_type toLen = sTo.length();
+ string::size_type frLen = sFrom.length();
+ string::size_type loc = 0;
+
+ while (string::npos != (loc = sNew.find(sFrom, loc)))
+ {
+ sNew.replace(loc, frLen, sTo);
+ loc += toLen;
+
+ if (loc >= sNew.length())
+ break;
+ }
+ }
+
+ return sNew;
+ }
+
/******************************************************************
**
**
Modified: trunk/libzypp/zypp/base/String.h
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/base/String.h?rev=6605&r1=6604&r2=6605&view=diff
==============================================================================
--- trunk/libzypp/zypp/base/String.h (original)
+++ trunk/libzypp/zypp/base/String.h Fri Aug 10 16:08:41 2007
@@ -322,6 +322,14 @@
inline bool endsWith(const std::string& s, const char* str) { return s.find(str) == s.size() - strlen(str)-1; }
inline bool contains(const std::string& s, const char* str) { return s.find(str) != std::string::npos; }
+ /**
+ * \short Looks for text in a string and replaces it.
+ *
+ * \note It only perform substtution in one pass
+ */
+ std::string gsub( const std::string& sData, const std::string& sFrom, const std::string& sTo);
+
+
///////////////////////////////////////////////////////////////////
/** \name String prefix handling.
Modified: trunk/libzypp/zypp/repo/RepoVariables.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/RepoVariables.cc?rev=6605&r1=6604&r2=6605&view=diff
==============================================================================
--- trunk/libzypp/zypp/repo/RepoVariables.cc (original)
+++ trunk/libzypp/zypp/repo/RepoVariables.cc Fri Aug 10 16:08:41 2007
@@ -10,6 +10,7 @@
#include <iostream>
#include <map>
#include <algorithm>
+#include "zypp/base/String.h"
#include "zypp/repo/RepoException.h"
#include "zypp/ZConfig.h"
#include "RepoVariables.h"
@@ -20,32 +21,6 @@
{
namespace repo
{
-
-static string
-gsub(const string& sData,
- const string& sFrom,
- const string& sTo)
-{
- string sNew = sData;
-
- if (! sNew.empty())
- {
- string::size_type toLen = sTo.length();
- string::size_type frLen = sFrom.length();
- string::size_type loc = 0;
-
- while (string::npos != (loc = sNew.find(sFrom, loc)))
- {
- sNew.replace(loc, frLen, sTo);
- loc += toLen;
-
- if (loc >= sNew.length())
- break;
- }
- }
-
- return sNew;
-}
RepoVariablesStringReplacer::RepoVariablesStringReplacer()
{}
@@ -58,9 +33,9 @@
string newvalue(value);
// $arch
- newvalue = gsub( newvalue,
- "$arch",
- ZConfig::instance().systemArchitecture().asString() );
+ newvalue = str::gsub( newvalue,
+ "$arch",
+ ZConfig::instance().systemArchitecture().asString() );
// $basearch
Arch::CompatSet cset( Arch::compatSet( ZConfig::instance().systemArchitecture() ) );
@@ -75,9 +50,9 @@
basearch = ZConfig::instance().systemArchitecture();
}
- newvalue = gsub( newvalue,
- "$basearch",
- basearch.asString() );
+ newvalue = str::gsub( newvalue,
+ "$basearch",
+ basearch.asString() );
return newvalue;
}
--
To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org
For additional commands, e-mail: zypp-commit+help@opensuse.org
