* Big cleanup of the semantics of paths, strings, contexts, string

  concatenation and string coercion.  This was a big mess (see
  e.g. NIX-67).  Contexts are now folded into strings, so that they
  don't cause evaluation errors when they're not expected.  The
  semantics of paths has been clarified (see nixexpr-ast.def).
  toString() and coerceToString() have been merged.

  Semantic change: paths are now copied to the store when they're in a
  concatenation (and in most other situations - that's the
  formalisation of the meaning of a path).  So

    "foo " + ./bla

  evaluates to "foo /nix/store/hash...-bla", not "foo
  /path/to/current-dir/bla".  This prevents accidental impurities, and
  is more consistent with the treatment of derivation outputs, e.g.,
  `"foo " + bla' where `bla' is a derivation.  (Here `bla' would be
  replaced by the output path of `bla'.)

1 files changed, 2 insertions, 12 deletions

diff --git a/src/libstore/derivations.cc b/src/libstore/derivations.cc
index 61b3ea89c..aeab675b2 100644
--- a/src/libstore/derivations.cc
+++ b/src/libstore/derivations.cc
@@ -113,16 +113,6 @@ Derivation parseDerivation(ATerm t)
 }
 
 
-static ATermList unparseStrings(const StringSet & paths)
-{
-    ATermList l = ATempty;
-    for (PathSet::const_reverse_iterator i = paths.rbegin();
-         i != paths.rend(); ++i)
-        l = ATinsert(l, toATerm(*i));
-    return l;
-}
-
-
 ATerm unparseDerivation(const Derivation & drv)
 {
     ATermList outputs = ATempty;
@@ -141,7 +131,7 @@ ATerm unparseDerivation(const Derivation & drv)
         inDrvs = ATinsert(inDrvs,
             makeDerivationInput(
                 toATerm(i->first),
-                unparseStrings(i->second)));
+                toATermList(i->second)));
     
     ATermList args = ATempty;
     for (Strings::const_reverse_iterator i = drv.args.rbegin();
@@ -159,7 +149,7 @@ ATerm unparseDerivation(const Derivation & drv)
     return makeDerive(
         outputs,
         inDrvs,
-        unparseStrings(drv.inputSrcs),
+        toATermList(drv.inputSrcs),
         toATerm(drv.platform),
         toATerm(drv.builder),
         args,