* Change the right-hand side of the ‘.’ operator from an attribute to

  an attribute path.  This is a refactoring to support default values.

1 files changed, 3 insertions, 2 deletions

diff --git a/src/libexpr/nixexpr.hh b/src/libexpr/nixexpr.hh
index 205f579daf..725e30c6fa 100644
--- a/src/libexpr/nixexpr.hh
+++ b/src/libexpr/nixexpr.hh
@@ -122,8 +122,9 @@ struct ExprVar : Expr
 struct ExprSelect : Expr
 {
     Expr * e;
-    Symbol name;
-    ExprSelect(Expr * e, const Symbol & name) : e(e), name(name) { };
+    AttrPath attrPath;
+    ExprSelect(Expr * e, const AttrPath & attrPath) : e(e), attrPath(attrPath) { };
+    ExprSelect(Expr * e, const Symbol & name) : e(e) { attrPath.push_back(name); };
     COMMON_METHODS
 };