lix-project/lix-releng-staging
0
0
Fork 0
Code Packages Activity

* Change the scoping of "inherit (e) ..." in recs so that the

Browse source 
attributes of the rec are in scope of `e'.  This is useful in
  expressions such as

    rec {
      lib = import ./lib;
      inherit (lib) concatStrings;
    }

  It does change the semantics of expressions such as

    let x = {y = 1;}; in rec { x = {y = 2;}; inherit (x) y; }.y

  This now returns 2 instead of 1.  However, no code in Nixpkgs or
  NixOS seems to rely on the old behaviour.
This commit is contained in:
Eelco Dolstra 2009-05-15 13:46:13 +00:00
parent d407d572fd
commit a64bbe049e
3 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/libexpr/parser.y
View file

@ -91,12 +91,13 @@ static Expr fixAttrs(bool recursive, ATermList as)
if (matchInherit(*i, src, names, pos)) {
bool fromScope = matchScope(src);
for (ATermIterator j(names); j; ++j) {
Expr rhs = fromScope ? makeVar(*j) : makeSelect(src, *j);
if (attrs.children.find(*j) != attrs.children.end())
throw ParseError(format("duplicate definition of attribute `%1%' at %2%")
% showAttrPath(ATmakeList1(*j)) % showPos(pos));
Tree & t(attrs.children[*j]);
t.leaf = rhs; t.pos = pos; if (recursive) t.recursive = false;
t.leaf = fromScope ? makeVar(*j) : makeSelect(src, *j);
t.pos = pos;
if (recursive && fromScope) t.recursive = false;
}
}

1
tests/lang/eval-okay-scope-7.exp Normal file
View file

@ -0,0 +1 @@
Int(1)

6
tests/lang/eval-okay-scope-7.nix Normal file
View file

@ -0,0 +1,6 @@
rec {
inherit (x) y;
x = {
y = 1;
};
}.y