with-resources: support multiple cleanup forms.

* share/txr/stdlib/with-resources.tl (with-resources):
Rearrange tree-case cases to recognize a sequence of cleanup
forms and insert into the output accordingly.

* txr.1: Documented.

1 files changed, 5 insertions, 5 deletions

diff --git a/share/txr/stdlib/with-resources.tl b/share/txr/stdlib/with-resources.tl
index eb061066..5c1b8130 100644
--- a/share/txr/stdlib/with-resources.tl
+++ b/share/txr/stdlib/with-resources.tl
@@ -26,15 +26,15 @@
 
 (defmacro with-resources (:form f res-bindings . body)
   (tree-case res-bindings
-    (((sym init cleanup) . rest)
+    (((sym init) . rest)
+     ^(let ((,sym ,init))
+        (with-resources ,rest ,*body)))
+    (((sym init . cleanup) . rest)
      ^(let ((,sym ,init))
         (when ,sym
           (unwind-protect
             (with-resources ,rest ,*body)
-            ,cleanup))))
-    (((sym init) . rest)
-     ^(let ((,sym ,init))
-        (with-resources ,rest ,*body)))
+            ,*cleanup))))
     ((sym . rest)
      ^(let (,sym)
         (with-resources ,rest ,*body)))