From 742f4908ae6b3f03930434594a56e5449e5fe4f2 Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Tue, 29 Nov 2016 22:40:17 -0800 Subject: conformance: handle macro wrong clause syntax. Contrary to the documentation, handle doesn't in fact have the same syntax as catch. It passes the exception symbol to clauses as the leftmost argument, followed by the exception arguments, whereas catch passes only the exception arguments. * share/txr/stdlib/except.tl (handle): Do not pass the exception sybmol as the leftmost argument, unless operating in TXR 161 or earlier compatibility. * tests/012/except.tl: drop exception symbol argument from handle clause. * txr.1: Compatibility note added. --- share/txr/stdlib/except.tl | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'share') diff --git a/share/txr/stdlib/except.tl b/share/txr/stdlib/except.tl index addc3a66..dee1bb6f 100644 --- a/share/txr/stdlib/except.tl +++ b/share/txr/stdlib/except.tl @@ -36,7 +36,10 @@ (unless (symbolp name) (sys:handle-bad-syntax hc)) (list name ^(apply (lambda ,arglist ,*body) - ,exc-sym ,exc-args))) + ,*(if (and (plusp sys:compat) + (<= 161 sys:compat)) + ^(,exc-sym)) + ,exc-args))) (else (sys:handle-bad-syntax hc)))))) ^(handler-bind (lambda (,exc-sym . ,exc-args) (cond -- cgit v1.2.3