Changeset 14558

Timestamp:

06/22/13 19:57:58 (10 years ago)

Author:

ehuelsmann

Message:

Fix FAILED AVER in recent cl-test-grid findings.

File:

• trunk/abcl/src/org/armedbear/lisp/compiler-pass1.lisp (modified) (1 diff)

trunk/abcl/src/org/armedbear/lisp/compiler-pass1.lisp

@@ -649 +649 @@
 (defun p1-java-jrun-exception-protected (form)
   (assert (eq (first form) 'java:jrun-exception-protected))
-  (assert (eq (car (second form)) 'lambda))
-  (assert (eq (cadr (second form)) nil))
-  (let* ((body (cddr (second form)))
+  (assert (or (eq (car (second form)) 'lambda)
+              (and (eq (car (second form)) 'function)
+                   (eq (car (second (second form))) 'lambda))))
+  (let* ((body (if (eq (car (second form)) 'lambda)
+                   (cddr (second form))
+                   (cddr (second (second form)))))
          (block (make-exception-protected-node))
          (*block* block)