From d445da7a7b3cbb4822bcad3904a36f0d914917d3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed, 4 Feb 2004 17:23:26 +0000
Subject: * Extended the `inherit' syntax to optionally select attributes from 
  other attribute sets, rather than the current scope.  E.g.,

    {inherit (pkgs) gcc binutils;}

  is equivalent to

    {gcc = pkgs.gcc; binutils = pkgs.binutils;}

  I am not so happy about the syntax.
---
 src/libexpr/parser.cc | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'src/libexpr/parser.cc')

diff --git a/src/libexpr/parser.cc b/src/libexpr/parser.cc
index 68b367340acf..c300a0d07bc4 100644
--- a/src/libexpr/parser.cc
+++ b/src/libexpr/parser.cc
@@ -50,11 +50,16 @@ ATerm fixAttrs(int recursive, ATermList as)
     ATermList * is = recursive ? &cs : &bs;
     for (ATermIterator i(as); i; ++i) {
         ATermList names;
-        if (atMatch(m, *i) >> "Inherit" >> names)
-            for (ATermIterator j(names); j; ++j)
-                *is = ATinsert(*is,
-                    ATmake("Bind(<term>, Var(<term>))", *j, *j));
-        else bs = ATinsert(bs, *i);
+        Expr src;
+        if (atMatch(m, *i) >> "Inherit" >> src >> names) {
+            bool fromScope = atMatch(m, src) >> "Scope";
+            for (ATermIterator j(names); j; ++j) {
+                Expr rhs = fromScope
+                    ? ATmake("Var(<term>)", *j)
+                    : ATmake("Select(<term>, <term>)", src, *j);
+                *is = ATinsert(*is, ATmake("Bind(<term>, <term>)", *j, rhs));
+            }
+        } else bs = ATinsert(bs, *i);
     }
     if (recursive)
         return ATmake("Rec(<term>, <term>)", bs, cs);
-- 
cgit 1.4.1