[armedbear-cvs] r12854 - branches/generic-class-file/abcl/src/org/armedbear/lisp

[Erik Huelsmann]

Author: ehuelsmann
Date: Mon Aug  2 07:03:40 2010
New Revision: 12854

Log:
Convert known-symbols.lisp to CLASS-NAMEs.

Modified:
   branches/generic-class-file/abcl/src/org/armedbear/lisp/jvm.lisp
   branches/generic-class-file/abcl/src/org/armedbear/lisp/known-symbols.lisp

Modified: branches/generic-class-file/abcl/src/org/armedbear/lisp/jvm.lisp
==============================================================================
--- branches/generic-class-file/abcl/src/org/armedbear/lisp/jvm.lisp	(original)
+++ branches/generic-class-file/abcl/src/org/armedbear/lisp/jvm.lisp	Mon Aug  2 07:03:40 2010
@@ -42,10 +42,10 @@
   (require "COMPILER-TYPES")
   (require "COMPILER-ERROR")
   (require "KNOWN-FUNCTIONS")
-  (require "KNOWN-SYMBOLS")
   (require "DUMP-FORM")
   (require "OPCODES")
   (require "JVM-CLASS-FILE")
+  (require "KNOWN-SYMBOLS")
   (require "JAVA")
   (require "COMPILER-PASS1")
   (require "COMPILER-PASS2"))

Modified: branches/generic-class-file/abcl/src/org/armedbear/lisp/known-symbols.lisp
==============================================================================
--- branches/generic-class-file/abcl/src/org/armedbear/lisp/known-symbols.lisp	(original)
+++ branches/generic-class-file/abcl/src/org/armedbear/lisp/known-symbols.lisp	Mon Aug  2 07:03:40 2010
@@ -38,7 +38,7 @@
 (let ((symbols (make-hash-table :test 'eq :size 2048)))
   (defun initialize-known-symbols (source ht)
     (let* ((source-class (java:jclass source))
-           (class-designator (substitute #\/ #\. source))
+           (class-designator (jvm::make-class-name source))
            (symbol-class (java:jclass "org.armedbear.lisp.Symbol"))
            (fields (java:jclass-fields source-class :declared t :public t)))
       (dotimes (i (length fields))