lix-project/lix
20
57
Fork 31
Code Issues 349 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Move getParsedTypeAndSRI to a more suitable location

Browse source 
Also mark it static
This commit is contained in:
John Ericson 2020-07-02 23:10:11 +00:00
parent 2f93d9f2ba
commit a7cd7425d9
2 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/libutil/hash.cc
View file

@ -144,6 +144,27 @@ Hash Hash::parseSRI(std::string_view original) {
return Hash(rest, parsedType, true);
}
// Mutates the string to eliminate the prefixes when found
static std::pair<std::optional<HashType>, bool> getParsedTypeAndSRI(std::string_view & rest) {
bool isSRI = false;
// Parse the has type before the separater, if there was one.
std::optional<HashType> optParsedType;
{
auto hashRaw = splitPrefix(rest, ':');
if (!hashRaw) {
hashRaw = splitPrefix(rest, '-');
if (hashRaw)
isSRI = true;
}
if (hashRaw)
optParsedType = parseHashType(*hashRaw);
}
return {optParsedType, isSRI};
}
Hash Hash::parseAnyPrefixed(std::string_view original)
{
auto rest = original;

21
src/libutil/parser.hh
View file

@ -21,26 +21,5 @@ static inline std::optional<std::string_view> splitPrefix(std::string_view & str
return std::nullopt;
}
// Mutates the string to eliminate the prefixes when found
std::pair<std::optional<HashType>, bool> getParsedTypeAndSRI(std::string_view & rest) {
bool isSRI = false;
// Parse the has type before the separater, if there was one.
std::optional<HashType> optParsedType;
{
auto hashRaw = splitPrefix(rest, ':');
if (!hashRaw) {
hashRaw = splitPrefix(rest, '-');
if (hashRaw)
isSRI = true;
}
if (hashRaw)
optParsedType = parseHashType(*hashRaw);
}
return std::make_pair(optParsedType, isSRI);
}
}