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

Decode string context straight to using StorePaths

Browse source 
I gather decoding happens on demand, so I hope don't think this should
have any perf implications one way or the other.
This commit is contained in:
John Ericson 2022-03-12 00:28:00 +00:00
parent 91adfb8894
commit 4d6a3806d2
7 changed files with 38 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/libexpr/eval.cc
View file

@ -1903,13 +1903,22 @@ std::string_view EvalState::forceString(Value & v, const Pos & pos)
/* Decode a context string ‘!<name>!<path>’ into a pair <path,
name>. */
NixStringContextElem decodeContext(std::string_view s)
NixStringContextElem decodeContext(const Store & store, std::string_view s)
{
if (s.at(0) == '!') {
size_t index = s.find("!", 1);
return {std::string(s.substr(index + 1)), std::string(s.substr(1, index - 1))};
return {
store.parseStorePath(s.substr(index + 1)),
std::string(s.substr(1, index - 1)),
};
} else
return {s.at(0) == '/' ? std::string(s) : std::string(s.substr(1)), ""};
return {
store.parseStorePath(
s.at(0) == '/'
? s
: s.substr(1)),
"",
};
}
@ -1921,13 +1930,13 @@ void copyContext(const Value & v, PathSet & context)
}
NixStringContext Value::getContext()
NixStringContext Value::getContext(const Store & store)
{
NixStringContext res;
assert(internalType == tString);
if (string.context)
for (const char * * p = string.context; *p; ++p)
res.push_back(decodeContext(*p));
res.push_back(decodeContext(store, *p));
return res;
}