Changeset 12088

Timestamp:

08/08/09 19:18:31 (14 years ago)

Author:

ehuelsmann

Message:

Register blocks with their compiland;
create a field in the variable-info structure to allow registration
of the block they belong to.

File:

• trunk/abcl/src/org/armedbear/lisp/jvm.lisp (modified) (4 diffs)

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

@@ -163 +163 @@
   (children 0       ; Number of local functions
             :type fixnum) ; defined with with FLET, LABELS or LAMBDA
+  blocks            ; TAGBODY, PROGV, BLOCK, etc. blocks
   argument-register
   closure-register
@@ -272 +273 @@
                            ; lexical environment
   used-non-locally-p
-  (compiland *current-compiland*))
+  (compiland *current-compiland*)
+  block)
 
 (defstruct (var-ref (:constructor make-var-ref (variable)))
@@ -370 +372 @@
 (defstruct (block-node (:conc-name block-)
                        (:include node)
-                       (:constructor make-block-node (name)))
+                       (:constructor %make-block-node (name)))
   (exit (gensym))
   target
@@ -395 +397 @@
 (defvar *blocks* ())
 
+(defknown make-block-node (t) t)
+(defun make-block-node (name)
+  (let ((block (%make-block-node name)))
+    (push block (compiland-blocks *current-compiland*))
+    block))
+
 (defun find-block (name)
   (dolist (block *blocks*)