Changeset 12116


Ignore:
Timestamp:
08/24/09 19:21:13 (12 years ago)
Author:
ehuelsmann
Message:

Convert LABELS BLOCK-NODEs to LABELS-NODEs.

Location:
trunk/abcl/src/org/armedbear/lisp
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/abcl/src/org/armedbear/lisp/compiler-pass1.lisp

    r12115 r12116  
    671671         (*current-compiland* (local-function-compiland local-function)))
    672672     (p1-compiland (local-function-compiland local-function))))
    673        (let* ((block (make-block-node '(LABELS)))
     673       (let* ((block (make-labels-node))
    674674              (*blocks* (cons block *blocks*))
    675675              (body (cddr form))
    676676              (*visible-variables* *visible-variables*))
    677          (setf (block-free-specials block)
     677         (setf (labels-free-specials block)
    678678               (process-declarations-for-vars body nil block))
    679          (dolist (special (block-free-specials block))
     679         (dolist (special (labels-free-specials block))
    680680           (push special *visible-variables*))
    681          (setf (block-form block)
     681         (setf (labels-form block)
    682682               (list* (car form) local-functions (p1-body (cddr form))))
    683683         block))))
  • trunk/abcl/src/org/armedbear/lisp/compiler-pass2.lisp

    r12115 r12116  
    49714971(defknown p2-labels-node (t t t) t)
    49724972(defun p2-labels-node (block target representation)
    4973   (let* ((form (block-form block))
     4973  (let* ((form (labels-form block))
    49744974         (*local-functions* *local-functions*)
    49754975         (*visible-variables* *visible-variables*)
     
    49864986    (dolist (local-function local-functions)
    49874987      (p2-labels-process-compiland local-function))
    4988     (dolist (special (block-free-specials block))
     4988    (dolist (special (labels-free-specials block))
    49894989      (push special *visible-variables*))
    4990     (compile-progn-body body target representation)))
     4990    (let ((*blocks* (cons block *blocks*)))
     4991      (compile-progn-body body target representation))))
    49914992
    49924993(defun p2-lambda (compiland target)
     
    79157916                   ((eq name 'LET)
    79167917                    (p2-let/let*-node form target representation))
    7917                    ((eq name 'LABELS)
    7918                     (p2-labels-node form target representation))
    7919                    ((eq name 'SETF) ;; SETF functions create
     7918;;                   ((eq name 'LABELS)
     7919;;                    (p2-labels-node form target representation))
     7920;;                   ((eq name 'SETF) ;; SETF functions create
    79207921                    ;; consp block names, if we're unlucky
    7921                     (p2-block-node form target representation))
     7922;;                    (p2-block-node form target representation))
    79227923                   (t
    79237924                    (print name)
     
    79377938           ((flet-node-p form)
    79387939            (p2-flet-node form target representation))
     7940           ((labels-node-p form)
     7941            (p2-labels-node form target representation))
    79397942           ((locally-node-p form)
    79407943            (p2-locally-node form target representation))
Note: See TracChangeset for help on using the changeset viewer.