diff options
author | pennae <github@quasiparticle.net> | 2022-03-04 20:54:50 +0100 |
---|---|---|
committer | pennae <github@quasiparticle.net> | 2022-04-21 21:25:18 +0200 |
commit | 39df15fb8e766c0a4fa2fda83784fb8a478a766c (patch) | |
tree | 8f60f47059cf33b6b9c62b92bbbd6783868b1d47 /src/libexpr/attr-path.cc | |
parent | 38de79fcf7e00187107e638036c010911d1b675b (diff) |
don't use full Pos for findPackageFilename/editorFor
only file and line of the returned position were ever used, it wasn't actually
used a position. as such we may as well use a path+int pair for only those two
values and remove a use of Pos that would not work well with a position table.
Diffstat (limited to 'src/libexpr/attr-path.cc')
-rw-r--r-- | src/libexpr/attr-path.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/libexpr/attr-path.cc b/src/libexpr/attr-path.cc index 32deecfae..c6e3a9c92 100644 --- a/src/libexpr/attr-path.cc +++ b/src/libexpr/attr-path.cc @@ -106,7 +106,7 @@ std::pair<Value *, Pos> findAlongAttrPath(EvalState & state, const std::string & } -Pos findPackageFilename(EvalState & state, Value & v, std::string what) +std::pair<std::string, uint32_t> findPackageFilename(EvalState & state, Value & v, std::string what) { Value * v2; try { @@ -132,9 +132,7 @@ Pos findPackageFilename(EvalState & state, Value & v, std::string what) throw ParseError("cannot parse line number '%s'", pos); } - Symbol file = state.symbols.create(filename); - - return { foFile, file, lineno, 0 }; + return { std::move(filename), lineno }; } |