wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-06 21:41:48 +02:00
Code Activity

WIP initial design

Browse source
This commit is contained in:
Carlo Nucera 2020-06-30 14:10:30 -04:00
parent a1f66d1d9e
commit b798efb829
3 changed files with 19 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/libutil/hash.cc
View file

@ -132,10 +132,13 @@ std::string Hash::to_string(Base base, bool includeType) const
return s;
}
Hash::Hash(std::string_view s, HashType type) : Hash(s, std::optional { type }) { }
Hash::Hash(std::string_view s) : Hash(s, std::optional<HashType>{}) { }
Hash fromSRI(std::string_view original) {
Hash::Hash(std::string_view original, std::optional<HashType> optType)
}
Hash::Hash(std::string_view s) : Hash(s, std::nullopt) { }
static HashType newFunction(std::string_view & rest, std::optional<HashType> optType)
{
auto rest = original;
@ -161,13 +164,17 @@ Hash::Hash(std::string_view original, std::optional<HashType> optType)
if (!optParsedType && !optType) {
throw BadHash("hash '%s' does not include a type, nor is the type otherwise known from context.", rest);
} else {
this->type = optParsedType ? *optParsedType : *optType;
if (optParsedType && optType && *optParsedType != *optType)
throw BadHash("hash '%s' should have type '%s'", original, printHashType(*optType));
return optParsedType ? *optParsedType : *optType;
}
}
init();
// mutates the string_view
Hash::Hash(std::string_view original, std::optional<HashType> optType)
: Hash(original, newFunction(original, optType))
Hash::Hash(std::string_view original, HashType type) : Hash(type) {
if (!isSRI && rest.size() == base16Len()) {
auto parseHexDigit = [&](char c) {