From ed23c8568e10d15196bb4ff2b79fc14191d28109 Mon Sep 17 00:00:00 2001
From: Fabian Schmitthenner <development@schmitthenner.eu>
Date: Tue, 19 Jan 2016 20:07:53 +0000
Subject: next try for "don't abort when given unmatched '}' with
 'start-condition stack underflow'. This fixes  #751"

This reverts commit 8120b6fb8a4924f8ae717bba9bbda4a2f89e2141 and fixes the regression introduced in
8d22b26448a091c76ab972c0b0603daac5e255e4.
---
 tests/lexer.nix | 2 ++
 tests/lexer.sh  | 3 +++
 tests/local.mk  | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 tests/lexer.nix
 create mode 100644 tests/lexer.sh

(limited to 'tests')

diff --git a/tests/lexer.nix b/tests/lexer.nix
new file mode 100644
index 000000000000..05c78b3016d3
--- /dev/null
+++ b/tests/lexer.nix
@@ -0,0 +1,2 @@
+let const = a: "const"; in
+''${ const { x = "q"; }}''
diff --git a/tests/lexer.sh b/tests/lexer.sh
new file mode 100644
index 000000000000..e45a6b00a542
--- /dev/null
+++ b/tests/lexer.sh
@@ -0,0 +1,3 @@
+source common.sh
+
+nix-instantiate --eval ./lexer.nix
diff --git a/tests/local.mk b/tests/local.mk
index 03f53b44c275..05c6e04ee17e 100644
--- a/tests/local.mk
+++ b/tests/local.mk
@@ -11,7 +11,7 @@ nix_tests = \
   binary-patching.sh timeout.sh secure-drv-outputs.sh nix-channel.sh \
   multiple-outputs.sh import-derivation.sh fetchurl.sh optimise-store.sh \
   binary-cache.sh nix-profile.sh repair.sh dump-db.sh case-hack.sh \
-  check-reqs.sh pass-as-file.sh tarball.sh
+  check-reqs.sh pass-as-file.sh tarball.sh lexer.sh
   # parallel.sh
 
 install-tests += $(foreach x, $(nix_tests), tests/$(x))
-- 
cgit 1.4.1