Changeset 12135


Ignore:
Timestamp:
09/06/09 13:58:46 (12 years ago)
Author:
ehuelsmann
Message:

Rename function (it's not applicable to FLET);
move it closer where it's actually used.

File:
1 edited

Legend:

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

    r12123 r12135  
    48924892
    48934893
    4894 (defun emit-make-compiled-closure-for-flet/labels
    4895     (local-function compiland declaration)
    4896   (emit 'getstatic *this-class* declaration +lisp-object+)
    4897   (let ((parent (compiland-parent compiland)))
    4898     (when (compiland-closure-register parent)
    4899       (dformat t "(compiland-closure-register parent) = ~S~%"
    4900          (compiland-closure-register parent))
    4901       (emit 'checkcast +lisp-compiled-closure-class+)
    4902       (duplicate-closure-array parent)
    4903       (emit-invokestatic +lisp-class+ "makeCompiledClosure"
    4904        (list +lisp-object+ +closure-binding-array+)
    4905        +lisp-object+)))
    4906   (emit-move-to-variable (local-function-variable local-function)))
    4907 
    49084894(defmacro with-temp-class-file (pathname class-file lambda-list &body body)
    49094895  `(let* ((,pathname (make-temp-file))
     
    49324918                     (load-compiled-function pathname)))))))
    49334919
     4920(defun emit-make-compiled-closure-for-labels
     4921    (local-function compiland declaration)
     4922  (emit 'getstatic *this-class* declaration +lisp-object+)
     4923  (let ((parent (compiland-parent compiland)))
     4924    (when (compiland-closure-register parent)
     4925      (dformat t "(compiland-closure-register parent) = ~S~%"
     4926         (compiland-closure-register parent))
     4927      (emit 'checkcast +lisp-compiled-closure-class+)
     4928      (duplicate-closure-array parent)
     4929      (emit-invokestatic +lisp-class+ "makeCompiledClosure"
     4930       (list +lisp-object+ +closure-binding-array+)
     4931       +lisp-object+)))
     4932  (emit-move-to-variable (local-function-variable local-function)))
     4933
    49344934(defknown p2-labels-process-compiland (t) t)
    49354935(defun p2-labels-process-compiland (local-function)
     
    49434943             (setf (local-function-class-file local-function) class-file)
    49444944             (let ((g (declare-local-function local-function)))
    4945          (emit-make-compiled-closure-for-flet/labels
     4945         (emit-make-compiled-closure-for-labels
    49464946    local-function compiland g))))
    49474947          (t
     
    49514951         (setf (local-function-class-file local-function) class-file)
    49524952         (let ((g (declare-object (load-compiled-function pathname))))
    4953      (emit-make-compiled-closure-for-flet/labels
     4953     (emit-make-compiled-closure-for-labels
    49544954      local-function compiland g)))))))
    49554955
Note: See TracChangeset for help on using the changeset viewer.