From 7667fc940e6ee797770ba966d4d6df74a1e6a4e6 Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Fri, 15 Jan 2021 07:12:15 -0800 Subject: matcher: use flag to eliminate block. * share/txr/stdlib/match.tl (compile-all-match): We use a flag to break out of the loop instead of (return). The loop's block is thereby later eliminated by the compiler. For this we re-purpose the same all-match-p-var symbol. --- share/txr/stdlib/match.tl | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'share') diff --git a/share/txr/stdlib/match.tl b/share/txr/stdlib/match.tl index dd917786..74026980 100644 --- a/share/txr/stdlib/match.tl +++ b/share/txr/stdlib/match.tl @@ -170,8 +170,9 @@ (matched-p-var (gensym "matched-p-")) (iter-var (gensym "iter-")) (collect-vars [mapcar gensym cm.vars]) - (loop ^(for ((,iter-var ,obj-var)) - (,iter-var t) + (loop ^(for ((,iter-var ,obj-var) + (,all-match-p-var t)) + ((and ,all-match-p-var ,iter-var) ,all-match-p-var) ((set ,iter-var (cdr ,iter-var))) (let ((,cm.obj-var (car ,iter-var)) ,matched-p-var @@ -185,7 +186,7 @@ cm.vars collect-vars))))) (unless ,matched-p-var - (return nil))))) + (set ,all-match-p-var nil))))) (guard (new match-guard vars (cons all-match-p-var collect-vars) var-exprs (list loop) -- cgit v1.2.3