Changeset 12102


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

Convert PROGV block-nodes to PROGV-NODEs.

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

Legend:

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

    r12101 r12102  
    780780  (let* ((symbols-form (p1 (cadr form)))
    781781         (values-form (p1 (caddr form)))
    782          (block (make-block-node '(PROGV)))
     782         (block (make-progv-node))
    783783         (*blocks* (cons block *blocks*))
    784784         (body (cdddr form)))
     
    791791;;        (let ((variable (make-variable :name name :special-p t)))
    792792;;          (push
    793     (setf (block-form block)
     793    (setf (progv-form block)
    794794          `(progv ,symbols-form ,values-form ,@(p1-body body))
    795           (block-environment-register block) t)
     795          (progv-environment-register block) t)
    796796    block))
    797797
  • trunk/abcl/src/org/armedbear/lisp/compiler-pass2.lisp

    r12101 r12102  
    47924792(defun p2-progv-node (block target representation)
    47934793  (declare (ignore representation))
    4794   (let* ((form (block-form block))
     4794  (let* ((form (progv-form block))
    47954795         (symbols-form (cadr form))
    47964796         (values-form (caddr form))
    47974797         (*register* *register*)
    47984798         (environment-register
    4799           (setf (block-environment-register block) (allocate-register)))
     4799          (setf (progv-environment-register block) (allocate-register)))
    48004800         (label-START (gensym)))
    48014801    (compile-form symbols-form 'stack nil)
     
    79217921                    (p2-m-v-b-node form target)
    79227922                    (fix-boxing representation nil))
    7923                    ((eq name 'UNWIND-PROTECT)
    7924                     (p2-unwind-protect-node form target)
    7925                     (fix-boxing representation nil))
    7926                    ((eq name 'CATCH)
    7927                     (p2-catch-node form target)
    7928                     (fix-boxing representation nil))
    79297923                   ((eq name 'PROGV)
    79307924                    (p2-progv-node form target representation))
    79317925                   ((eq name 'LOCALLY)
    79327926                    (p2-locally-node form target representation))
    7933                    ((eq name 'THREADS:SYNCHRONIZED-ON)
    7934                     (p2-threads-synchronized-on form target)
    7935                     (fix-boxing representation nil)))))))
     7927                   )))))
    79367928        ((node-p form)
    79377929         (cond
Note: See TracChangeset for help on using the changeset viewer.