From a11a36d50d17e4cc3f1b6eec252156dd6201beef Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Wed, 11 May 2022 07:48:12 -0700 Subject: lambda-match: bug: over-strict match in variadic pattern. * stdlib/match.tl (expand-lambda-match): A pattern that is shorter than the maximum number of arguments is augmented with a check ensuring that no fixed arguments are present beyond those that the pattern requires. However, this check must be omitted if the pattern is variadic, because those excess arguments match its tail pattern. * tests/011/patmatch.tl: Cases added. --- stdlib/match.tl | 2 +- tests/011/patmatch.tl | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/stdlib/match.tl b/stdlib/match.tl index 17870be2..55d50417 100644 --- a/stdlib/match.tl +++ b/stdlib/match.tl @@ -782,7 +782,7 @@ (when (> pc.nfixed min-args) (set exp ^(when ,[present-vec (pred pc.nfixed)] ,exp))) - (when (< pc.nfixed max-args) + (when (and (not vp) (< pc.nfixed max-args)) (set exp ^(unless ,[present-vec pc.nfixed] ,exp))) (when (and variadic (not vp) (= pc.nfixed max-args)) diff --git a/tests/011/patmatch.tl b/tests/011/patmatch.tl index 08bcd0f7..81cda935 100644 --- a/tests/011/patmatch.tl +++ b/tests/011/patmatch.tl @@ -247,6 +247,20 @@ ((@x @y) :no-match)) 1 2 3] :error))) +(test + [(lambda-match + ((@a @b) (list a b)) + ((@x . @y) (list x y))) + 1 2 3] + (1 (2 3))) + +(test + [(lambda-match + ((@a @b) (list a b)) + (@x x)) + 1 2 3] + (1 2 3)) + (defun-match fib ((0) 1) ((1) 1) -- cgit v1.2.3