libexpr: findDerivationFilename return Pos instead of tuple

1 files changed, 5 insertions, 3 deletions

diff --git a/src/libexpr/attr-path.cc b/src/libexpr/attr-path.cc
index 7a6d8dfd0..c86dbeebb 100644
--- a/src/libexpr/attr-path.cc
+++ b/src/libexpr/attr-path.cc
@@ -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 };
 }