diff options
| author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2010-10-29T15·04+0000 |
|---|---|---|
| committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2010-10-29T15·04+0000 |
| commit | 4aced7f8d0d5d2c1057b0f46a70a37a577f81fa5 (patch) | |
| tree | 1908294aa8f029be6bc4c0f227074391dbaeee9b /src/libexpr/attr-path.cc | |
| parent | 8dadcede65c75488da4cc5e5d8266c4b176cb7e5 (diff) | |
| parent | 26def5392f6f6364aa0939a2d4fc7705e786d38d (diff) | |
* Merge the GC branch.
Diffstat (limited to 'src/libexpr/attr-path.cc')
| -rw-r--r-- | src/libexpr/attr-path.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/libexpr/attr-path.cc b/src/libexpr/attr-path.cc index 0660ba1c1efc..49c08339ae55 100644 --- a/src/libexpr/attr-path.cc +++ b/src/libexpr/attr-path.cc @@ -5,8 +5,9 @@ namespace nix { +// !!! Shouldn't we return a pointer to a Value? void findAlongAttrPath(EvalState & state, const string & attrPath, - const Bindings & autoArgs, Expr * e, Value & v) + Bindings & autoArgs, Expr * e, Value & v) { Strings tokens = tokenizeString(attrPath, "."); @@ -48,7 +49,7 @@ void findAlongAttrPath(EvalState & state, const string & attrPath, Bindings::iterator a = v.attrs->find(state.symbols.create(attr)); if (a == v.attrs->end()) throw Error(format("attribute `%1%' in selection path `%2%' not found") % attr % curPath); - v = a->second.value; + v = *a->value; } else if (apType == apIndex) { |