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

resolve redundant priority passing, wrap NixInt in eval-cache variant

Browse source
This commit is contained in:
Eli Kogan-Wang 2022-05-16 15:17:35 +02:00
parent c81d24f1c7
commit 27d0f6747d
5 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/libexpr/eval-cache.cc
View file

@ -306,7 +306,7 @@ struct AttrDb
case AttrType::Bool:
return {{rowId, queryAttribute.getInt(2) != 0}};
case AttrType::Int:
return {{rowId, queryAttribute.getInt(2)}};
return {{rowId, (int_t) queryAttribute.getInt(2)}};
case AttrType::ListOfStrings:
return {{rowId, tokenizeString<std::vector<std::string>>(queryAttribute.getStr(2), "\t")}};
case AttrType::Missing:
@ -649,9 +649,9 @@ NixInt AttrCursor::getInt()
if (!cachedValue)
cachedValue = root->db->getAttr(getKey());
if (cachedValue && !std::get_if<placeholder_t>(&cachedValue->second)) {
if (auto i = std::get_if<NixInt>(&cachedValue->second)) {
if (auto i = std::get_if<int_t>(&cachedValue->second)) {
debug("using cached Integer attribute '%s'", getAttrPathStr());
return *i;
return (*i).x;
} else
throw TypeError("'%s' is not an Integer", getAttrPathStr());
}