From 80adc0257a941ccda132ca04a15ed98727fd8199 Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Mon, 26 Apr 2021 07:40:41 -0700 Subject: matcher: quasi match incorrectly treats nil as bound. * share/txr/stdlib/match.tl (expand-quasi-match): bound-p local function must return nil if the symbol is nil. * share/txr/stdlib/match.tl: New test cases testing that @nil is treated as an unbound variable in the non-consecutive-variables test. Also, making duplicates of certain tests that start with a text match and sticking @nil as the first element into them, so that the text match is forced to be the second item. --- tests/011/patmatch.tl | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'tests/011') diff --git a/tests/011/patmatch.tl b/tests/011/patmatch.tl index 063e574b..54dda990 100644 --- a/tests/011/patmatch.tl +++ b/tests/011/patmatch.tl @@ -344,7 +344,11 @@ (test (when-match `@a` "abc" a) "abc") (macro-time-let ((*stderr* *stdnull*)) - (test (when-match `@a@b` "abc" a) :error)) + (test (when-match `@a@b` "abc" a) :error) + (test (when-match `@nil@b` "abc" a) :error) + (test (when-match `@nil@nil` "abc" a) :error) + (test (when-match `@a@nil` "abc" a) :error)) + (test (when-match `@a-$` "a-$" a) "a") (test (when-match `#@a-$` "#a-$" a) "a") -- cgit v1.2.3