wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-28 09:31:16 +02:00
Code Activity

replace own regex class with std::regex

Browse source
This commit is contained in:
Alexander Ried 2016-10-18 20:21:21 +02:00
parent ae8884b949
commit b05b98df75
5 changed files with 14 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/libexpr/names.cc
View file

@ -33,8 +33,8 @@ DrvName::DrvName(const string & s) : hits(0)
bool DrvName::matches(DrvName & n)
{
if (name != "*") {
if (!regex) regex = std::shared_ptr<Regex>(new Regex(name));
if (!regex->matches(n.name)) return false;
if (!regex) regex = std::unique_ptr<std::regex>(new std::regex(name, std::regex::extended));
if (!std::regex_match(n.name, *regex)) return false;
}
if (version != "" && version != n.version) return false;
return true;