Changeset 12583 for trunk/abcl/src/org/armedbear/lisp/clos.lisp

Timestamp:

04/08/10 19:44:14 (13 years ago)

Author:

astalla

Message:

JAVA-CLASS metaclass reimplemented in Lisp.

File:

• trunk/abcl/src/org/armedbear/lisp/clos.lisp (modified) (2 diffs)

trunk/abcl/src/org/armedbear/lisp/clos.lisp

@@ -579 +579 @@
   (getf canonical-slot :name))
 
-(defvar *extensible-built-in-classes* (list (find-class 'sequence)))
+(defvar *extensible-built-in-classes* (list (find-class 'sequence) (find-class 'java:java-object)))
 
 (defun ensure-class (name &rest all-keys &key metaclass &allow-other-keys)
@@ -972 +972 @@
   ((and (consp specializer)
               (eq (car specializer) 'java:jclass))
-         (let ((class-name (cadr specializer)))
-           (when (and (consp class-name)
-                      (eq (car class-name) 'quote))
-             (setf class-name (cadr class-name)))
-           (java::%find-java-class class-name)))
+         (let ((jclass (eval specializer)))
+     (java::ensure-java-class jclass)))
         (t
          (error "Unknown specializer: ~S" specializer))))