diff options
author | Alexander Ried <ried@mytum.de> | 2016-10-18T18·21+0200 |
---|---|---|
committer | Alexander Ried <ried@mytum.de> | 2016-10-18T18·22+0200 |
commit | b05b98df7544d02387f583ca5434f33f3e9cb471 (patch) | |
tree | 4f2c923dc552faed3bf2ea1330d4bf68eda80471 /src/libutil | |
parent | ae8884b94975673e6a3338d2c5173c006b4c8d4b (diff) |
replace own regex class with std::regex
Diffstat (limited to '')
-rw-r--r-- | src/libutil/regex.cc | 50 | ||||
-rw-r--r-- | src/libutil/regex.hh | 29 |
2 files changed, 0 insertions, 79 deletions
diff --git a/src/libutil/regex.cc b/src/libutil/regex.cc deleted file mode 100644 index 84274b3e1da9..000000000000 --- a/src/libutil/regex.cc +++ /dev/null @@ -1,50 +0,0 @@ -#include "regex.hh" -#include "types.hh" - -#include <algorithm> - -namespace nix { - -Regex::Regex(const string & pattern, bool subs) -{ - /* Patterns must match the entire string. */ - int err = regcomp(&preg, ("^(" + pattern + ")$").c_str(), (subs ? 0 : REG_NOSUB) | REG_EXTENDED); - if (err) throw RegexError(format("compiling pattern ‘%1%’: %2%") % pattern % showError(err)); - nrParens = subs ? std::count(pattern.begin(), pattern.end(), '(') : 0; -} - -Regex::~Regex() -{ - regfree(&preg); -} - -bool Regex::matches(const string & s) -{ - int err = regexec(&preg, s.c_str(), 0, 0, 0); - if (err == 0) return true; - else if (err == REG_NOMATCH) return false; - throw Error(format("matching string ‘%1%’: %2%") % s % showError(err)); -} - -bool Regex::matches(const string & s, Subs & subs) -{ - regmatch_t pmatch[nrParens + 2]; - int err = regexec(&preg, s.c_str(), nrParens + 2, pmatch, 0); - if (err == 0) { - for (unsigned int n = 2; n < nrParens + 2; ++n) - if (pmatch[n].rm_eo != -1) - subs[n - 2] = string(s, pmatch[n].rm_so, pmatch[n].rm_eo - pmatch[n].rm_so); - return true; - } - else if (err == REG_NOMATCH) return false; - throw Error(format("matching string ‘%1%’: %2%") % s % showError(err)); -} - -string Regex::showError(int err) -{ - char buf[256]; - regerror(err, &preg, buf, sizeof(buf)); - return string(buf); -} - -} diff --git a/src/libutil/regex.hh b/src/libutil/regex.hh deleted file mode 100644 index 53e31f4edc4a..000000000000 --- a/src/libutil/regex.hh +++ /dev/null @@ -1,29 +0,0 @@ -#pragma once - -#include "types.hh" - -#include <sys/types.h> -#include <regex.h> - -#include <map> - -namespace nix { - -MakeError(RegexError, Error) - -class Regex -{ -public: - Regex(const string & pattern, bool subs = false); - ~Regex(); - bool matches(const string & s); - typedef std::map<unsigned int, string> Subs; - bool matches(const string & s, Subs & subs); - -private: - unsigned nrParens; - regex_t preg; - string showError(int err); -}; - -} |