diff options
| -rw-r--r-- | share/txr/stdlib/match.tl | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/share/txr/stdlib/match.tl b/share/txr/stdlib/match.tl index 38145218..b1db1f2d 100644 --- a/share/txr/stdlib/match.tl +++ b/share/txr/stdlib/match.tl @@ -253,14 +253,16 @@ (mapcar (ret ^(set ,@1 nil)) (diff all-vars pm.vars))) t)))))) - (let ((guard (new match-guard - guard-expr ^(,op ,*[mapcar submatch-fun par-matches])))) + (let ((guard0 (new match-guard + guard-expr t + vars all-vars)) + (guard1 (new match-guard + guard-expr ^(,op ,*[mapcar submatch-fun par-matches])))) (new compiled-match pattern par-pat obj-var obj-var - guard-chain (list guard) - test-expr t - vars (uniq (mappend .vars par-matches)))))))) + guard-chain (list guard0 guard1) + test-expr t)))))) (defun compile-not-match (pattern obj-var) (tree-bind (op pattern) pattern |