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

libexpr: findDerivationFilename return Pos instead of tuple

Browse source
This commit is contained in:
zimbatm 2019-10-28 21:22:38 +01:00
parent 59c7249769
commit ec448f8bb6
No known key found for this signature in database
GPG key ID: 71BAF6D40C1D63D7
4 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/libexpr/attr-path.cc
View file

@ -93,7 +93,7 @@ Value * findAlongAttrPath(EvalState & state, const string & attrPath,
}
std::tuple<std::string, int> findDerivationFilename(EvalState & state, Value & v, std::string what)
Pos findDerivationFilename(EvalState & state, Value & v, std::string what)
{
Value * v2;
try {
@ -110,14 +110,16 @@ std::tuple<std::string, int> findDerivationFilename(EvalState & state, Value & v
throw Error("cannot parse meta.position attribute '%s'", pos);
std::string filename(pos, 0, colon);
int lineno;
unsigned int lineno;
try {
lineno = std::stoi(std::string(pos, colon + 1));
} catch (std::invalid_argument & e) {
throw Error("cannot parse line number '%s'", pos);
}
return std::make_tuple(filename, lineno);
Symbol file = state.symbols.create(filename);
return { file, lineno, 0 };
}