[armedbear-cvs] r12092 - trunk/abcl/src/org/armedbear/lisp

[Erik Huelsmann]

Author: ehuelsmann
Date: Tue Aug 11 07:38:00 2009
New Revision: 12092

Log:
With node/block changes ahead: when unsure about the actual type of the node
being accessed, use NODE accessors.

Modified:
   trunk/abcl/src/org/armedbear/lisp/jvm.lisp

Modified: trunk/abcl/src/org/armedbear/lisp/jvm.lisp
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/jvm.lisp	(original)
+++ trunk/abcl/src/org/armedbear/lisp/jvm.lisp	Tue Aug 11 07:38:00 2009
@@ -404,7 +404,7 @@
 
 (defun find-block (name)
   (dolist (block *blocks*)
-    (when (eq name (block-name block))
+    (when (eq name (node-name block))
       (return block))))
 
 (defknown node-constant-p (t) boolean)
@@ -426,7 +426,7 @@
 Non-local exits are required by blocks which do more in their cleanup
 than just restore the lastSpecialBinding (= dynamic environment).
 "
-  (let ((name (block-name object)))
+  (let ((name (node-name object)))
     (or (equal name '(CATCH))
         (equal name '(UNWIND-PROTECT))
         (equal name '(THREADS:SYNCHRONIZED-ON)))))