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

Checkpoint

Browse source
This commit is contained in:
Eelco Dolstra 2022-03-01 19:08:20 +01:00
parent 00b0fb27c1
commit 06c1edf889
18 changed files with 134 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/libexpr/paths.cc
View file

@ -3,34 +3,15 @@
namespace nix {
static constexpr std::string_view marker = "/__virtual/";
Path EvalState::packPath(const SourcePath & path)
SourcePath EvalState::rootPath(Path path)
{
// FIXME: canonPath(path) ?
assert(hasPrefix(path.path, "/"));
inputAccessors.emplace(path.accessor->number, path.accessor);
return std::string(marker) + std::to_string(path.accessor->number) + path.path;
return {*rootFS, std::move(path)};
}
SourcePath EvalState::unpackPath(const Path & path)
InputAccessor & EvalState::registerAccessor(ref<InputAccessor> accessor)
{
if (hasPrefix(path, marker)) {
auto s = path.substr(marker.size());
auto slash = s.find('/');
auto n = std::stoi(s.substr(0, slash));
auto i = inputAccessors.find(n);
assert(i != inputAccessors.end());
return {i->second, slash != std::string::npos ? s.substr(slash) : "/"};
} else {
printError("FIXME: %s", path);
return rootPath(path);
}
}
SourcePath EvalState::rootPath(const Path & path)
{
return {rootFS, path};
inputAccessors.emplace(&*accessor, accessor);
return *accessor;
}
}