From de90fdf908f2504e1a89a5d4660552cbcc1a15d5 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 1 Sep 2006 12:04:06 +0000 Subject: * Allow "$" in strings as long as they are not followed by "{". (Too bad flex doesn't have lexical restrictions, the current solution isn't quite right...) --- tests/lang/eval-okay-string.exp | 2 +- tests/lang/eval-okay-string.nix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'tests/lang') diff --git a/tests/lang/eval-okay-string.exp b/tests/lang/eval-okay-string.exp index dd0e5e248..335e3281e 100644 --- a/tests/lang/eval-okay-string.exp +++ b/tests/lang/eval-okay-string.exp @@ -1 +1 @@ -Str("foobar/a/b/c/d/foo/xyzzy/foo.txt/../foo/x/yescape: \"quote\" \n \\end\nof\nlinefoobarblaat") +Str("foobar/a/b/c/d/foo/xyzzy/foo.txt/../foo/x/yescape: \"quote\" \n \\end\nof\nlinefoobarblaatfoo$bar") diff --git a/tests/lang/eval-okay-string.nix b/tests/lang/eval-okay-string.nix index f2452e857..086ba4bf9 100644 --- a/tests/lang/eval-okay-string.nix +++ b/tests/lang/eval-okay-string.nix @@ -7,3 +7,4 @@ of line" + "foo${if true then "b${"a" + "r"}" else "xyzzy"}blaat" + + "foo$bar" -- cgit v1.2.3