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

remove ExprAttrs::AttrDef::inherited

Browse source 
it's no longer widely used and has a rather confusing meaning now that
inherit-from is handled very differently.
This commit is contained in:
pennae 2024-02-26 15:33:52 +01:00
parent cefd0302b5
commit 1cd87b7042
3 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libexpr/parser-state.hh
View file

@ -89,7 +89,7 @@ inline void ParserState::addAttr(ExprAttrs * attrs, AttrPath && attrPath, Expr *
if (i->symbol) {
ExprAttrs::AttrDefs::iterator j = attrs->attrs.find(i->symbol);
if (j != attrs->attrs.end()) {
if (!j->second.inherited()) {
if (j->second.kind != ExprAttrs::AttrDef::Kind::Inherited) {
ExprAttrs * attrs2 = dynamic_cast<ExprAttrs *>(j->second.e);
if (!attrs2) dupAttr(attrPath, pos, j->second.pos);
attrs = attrs2;