wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-28 22:01:15 +02:00
Code Activity

Simplify inherited attribute handling

Browse source 
This reduces the difference between inherited and non-inherited
attribute handling to the choice of which env to use (in recs and lets)
by setting the AttrDef::e to a new ExprVar in the parser rather than
carrying a separate AttrDef::v VarRef member.

As an added bonus, this allows inherited attributes that inherit from a
with to delay forcing evaluation of the with's attributes.

Signed-off-by: Shea Levy <shea@shealevy.com>
This commit is contained in:
Shea Levy 2013-07-15 17:10:18 -04:00 • committed by Eelco Dolstra
parent 6cd6ce5608
commit afc6c1bad6
7 changed files with 46 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libexpr/parser.y
View file

@ -413,7 +413,7 @@ binds
if ($$->attrs.find(*i) != $$->attrs.end())
dupAttr(*i, makeCurPos(@3, data), $$->attrs[*i].pos);
Pos pos = makeCurPos(@3, data);
$$->attrs[*i] = ExprAttrs::AttrDef(*i, pos);
$$->attrs[*i] = ExprAttrs::AttrDef(new ExprVar(*i), pos, true);
}
}
| binds INHERIT '(' expr ')' attrs ';'