Changeset 12852

Timestamp:

08/02/10 10:48:45 (13 years ago)

Author:

ehuelsmann

Message:

Convert GENERATE-LOADER-FUNCTION to use CLASS-NAMEs
instead of literal strings.

File:

• branches/generic-class-file/abcl/src/org/armedbear/lisp/compile-file.lisp (modified) (3 diffs)

branches/generic-class-file/abcl/src/org/armedbear/lisp/compile-file.lisp

@@ -673 +673 @@
   `(case ,expr ,@clauses))))
 
+(defconstant +fasl-classloader+
+  (jvm::make-class-name "org.armedbear.lisp.FaslClassLoader"))
+
 (defun generate-loader-function ()
   (let* ((basename (base-classname))
@@ -681 +684 @@
        :for i :from 1 :to *class-number*
        :collect
-       (let ((class (%format nil "org/armedbear/lisp/~A_~A" basename i)))
+       (let* ((class (%format nil "org/armedbear/lisp/~A_~A"
+                                                basename i))
+                                (class-name (jvm::make-class-name class)))
          `(,(1- i)
             (jvm::with-inline-code ()
@@ -687 +692 @@
         (jvm::emit-invokevirtual jvm::+lisp-object+ "javaInstance"
                nil jvm::+java-object+)
-        (jvm::emit 'jvm::checkcast "org/armedbear/lisp/FaslClassLoader")
+        (jvm::emit 'jvm::checkcast +fasl-classloader+)
         (jvm::emit 'jvm::dup)
         (jvm::emit-push-constant-int ,(1- i))
-        (jvm::emit 'jvm::new ,class)
+        (jvm::emit 'jvm::new ,class-name)
         (jvm::emit 'jvm::dup)
-        (jvm::emit-invokespecial-init ,class '())
-        (jvm::emit-invokevirtual "org/armedbear/lisp/FaslClassLoader" "putFunction"
+        (jvm::emit-invokespecial-init ,class-name '())
+        (jvm::emit-invokevirtual +fasl-classloader+
+                                                         "putFunction"
                (list "I" jvm::+lisp-object+) jvm::+lisp-object+)
         (jvm::emit 'jvm::pop))