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

[Erik Huelsmann]

Author: ehuelsmann
Date: Sat May 16 05:02:21 2009
New Revision: 11880

Log:
Remove the KIND slot from the COMPILAND structure:
ever since we stopped compiling XEPs, we don't
distinguish :EXTERNAL and :INTERNAL compilands anymore.

Modified:
   trunk/abcl/src/org/armedbear/lisp/compiler-pass2.lisp
   trunk/abcl/src/org/armedbear/lisp/jvm.lisp

Modified: trunk/abcl/src/org/armedbear/lisp/compiler-pass2.lisp
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/compiler-pass2.lisp	(original)
+++ trunk/abcl/src/org/armedbear/lisp/compiler-pass2.lisp	Sat May 16 05:02:21 2009
@@ -8018,9 +8018,9 @@
          (*child-p* (not (null (compiland-parent compiland))))
 
          (descriptor (analyze-args compiland))
-         (execute-method-name (if (eq (compiland-kind compiland) :external)
-                                  "execute" "_execute"))
-         (execute-method (make-method :name execute-method-name
+         (execute-method (make-method :name (if (and *child-p*
+                                                     *closure-variables*)
+                                                "_execute" "execute")
                                       :descriptor descriptor))
          (*code* ())
          (*register* 1) ;; register 0: "this" pointer
@@ -8233,8 +8233,6 @@
                 (*child-p*
                  (if *closure-variables*
                      (progn
-                       (setf execute-method-name
-                             (setf (method-name execute-method) "_execute"))
                        (setf (method-name-index execute-method)
                              (pool-name (method-name execute-method)))
                        (setf (method-descriptor-index execute-method)

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	Sat May 16 05:02:21 2009
@@ -153,7 +153,6 @@
 
 (defstruct compiland
   name
-  (kind :external)  ; :INTERNAL or :EXTERNAL
   lambda-expression
   arg-vars          ; variables for lambda arguments
   free-specials     ;