diff options
| author | Kaz Kylheku <kaz@kylheku.com> | 2016-11-29 22:40:17 -0800 |
|---|---|---|
| committer | Kaz Kylheku <kaz@kylheku.com> | 2016-11-29 22:40:17 -0800 |
| commit | 742f4908ae6b3f03930434594a56e5449e5fe4f2 (patch) | |
| tree | f70241e038aa5bf4aa2cf32a693f8ec4f348867e | |
| parent | fb5b723fb7da2824a29cac475381056e3dfe1d52 (diff) | |
| download | txr-742f4908ae6b3f03930434594a56e5449e5fe4f2.tar.gz txr-742f4908ae6b3f03930434594a56e5449e5fe4f2.tar.bz2 txr-742f4908ae6b3f03930434594a56e5449e5fe4f2.zip | |
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.
| -rw-r--r-- | share/txr/stdlib/except.tl | 5 | ||||
| -rw-r--r-- | tests/012/except.tl | 2 | ||||
| -rw-r--r-- | txr.1 | 21 |
3 files changed, 26 insertions, 2 deletions
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 diff --git a/tests/012/except.tl b/tests/012/except.tl index 1eb85017..7fe9dad2 100644 --- a/tests/012/except.tl +++ b/tests/012/except.tl @@ -8,7 +8,7 @@ (test (handle (list (cont (throw 'd 1)) (cont (throw 'c 2))) - (a (exc arg) + (a (arg) (let ((cont (find-frame 'cont))) (if cont (progn @@ -50389,6 +50389,27 @@ of these version values, the described behaviors are provided if is given an argument which is equal or lower. For instance .code "-C 103" selects the behaviors described below for version 105, but not those for 102. +.IP 161 +Version 161 was the last version in which a bug existed in the +.code handle +macro. In spite of the documentation claiming that +.code handle +has the same syntax as +.codn catch , +the clauses of +.code handle +were being passed the exception symbol as the leftmost argument, followed +by the exception arguments. This convention is different from +.code catch +clauses which do not receive the exception symbol, only the arguments. +The discrepancy was corrected by making +.code handle +behave like +.codn catch , +as documented. Requesting compatibility with 161 or earlier restores +the previous behavior of the +.code handle +macro. .IP 156 After version 156, two behaviors changed in the in the macro expander for .codn caseq , |