nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-30 22:20:59 +01:00
Code Activity

Remove some FIXMEs

Browse source
This commit is contained in:
Eelco Dolstra 2022-09-12 15:10:54 +02:00
parent 1b8065f255
commit 85c1959240
5 changed files with 3 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/libexpr/parser.y
View file

@ -509,11 +509,6 @@ string_parts_interpolated
path_start
: PATH {
SourcePath path { data->basePath.accessor, CanonPath({$1.p, $1.l}, data->basePath.path) };
#if 0
/* add back in the trailing '/' to the first segment */
if ($1.p[$1.l-1] == '/' && $1.l > 1)
path.path += "/";
#endif
$$ = new ExprPath(std::move(path));
}
| HPATH {
@ -700,7 +695,6 @@ Expr * EvalState::parseExprFromFile(const SourcePath & path, std::shared_ptr<Sta
auto buffer = path.readFile();
// readFile hopefully have left some extra space for terminators
buffer.append("\0\0", 2);
// FIXME: pass SourcePaths
return parse(buffer.data(), buffer.size(), Pos::Origin(path), path.parent(), staticEnv);
}