diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-02-08T18·49+0100 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-02-08T19·04+0100 |
commit | 5f18cd2e84bb4d7405f7dbcc8b6554365556a3a1 (patch) | |
tree | a94dda435037890dcc3af5bf9d5df5d3a01f01b4 /src/libexpr/nixexpr.hh | |
parent | 52172607cfc33867c0cdb526bef99c315e98baa2 (diff) |
Make "${./path} ..." evaluate to a string, not a path
Wacky string coercion semantics caused expressions like exec = "${./my-script} params..."; to evaluate to a path (‘/path/my-script params’), because anti-quotations are desuged to string concatenation: exec = ./my-script + " params..."; By constrast, adding a space at the start would yield a string as expected: exec = " ${./my-script} params..."; Now the first example also evaluates to a string.
Diffstat (limited to 'src/libexpr/nixexpr.hh')
-rw-r--r-- | src/libexpr/nixexpr.hh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/libexpr/nixexpr.hh b/src/libexpr/nixexpr.hh index bc6c3287c79d..86a7bfd506a0 100644 --- a/src/libexpr/nixexpr.hh +++ b/src/libexpr/nixexpr.hh @@ -277,8 +277,10 @@ MakeBinOp(OpConcatLists, "++") struct ExprConcatStrings : Expr { + bool forceString; vector<Expr *> * es; - ExprConcatStrings(vector<Expr *> * es) : es(es) { }; + ExprConcatStrings(bool forceString, vector<Expr *> * es) + : forceString(forceString), es(es) { }; COMMON_METHODS }; |