Changeset 12942

Timestamp:

10/03/10 09:08:55 (13 years ago)

Author:

ehuelsmann

Message:

Fix !-prefixed symbols: there are no duplicate symbols anymore;
replacement work has been done: everything is on trunk.

File:

• trunk/abcl/test/lisp/abcl/class-file.lisp (modified) (21 diffs)

trunk/abcl/test/lisp/abcl/class-file.lisp

@@ -161 +161 @@
 (deftest make-class-file.1
     (let* ((class (jvm::make-class-name "org/armedbear/lisp/mcf_1"))
-           (file (jvm::!make-class-file class jvm::+lisp-object+ '(:public))))
+           (file (jvm::make-class-file class jvm::+lisp-object+ '(:public))))
       (jvm::class-add-field file (jvm::make-field "ABC" :int))
       (jvm::class-add-field file (jvm::make-field "ABD" jvm::+lisp-object+))
-      (jvm::class-add-method file (jvm::!make-method "MBC" nil :int))
-      (jvm::class-add-method file (jvm::!make-method "MBD" nil jvm::+lisp-object+))
-      (jvm::class-add-method file (jvm::!make-method :constructor :void nil))
-      (jvm::class-add-method file (jvm::!make-method :class-constructor :void nil))
+      (jvm::class-add-method file (jvm::make-method "MBC" nil :int))
+      (jvm::class-add-method file (jvm::make-method "MBD" nil jvm::+lisp-object+))
+      (jvm::class-add-method file (jvm::make-method :constructor :void nil))
+      (jvm::class-add-method file (jvm::make-method :class-constructor :void nil))
       T)
   T)
@@ -173 +173 @@
 (deftest finalize-class-file.1
     (let* ((class (jvm::make-class-name "org/armedbear/lisp/fcf_1"))
-           (file (jvm::!make-class-file class jvm::+lisp-object+ '(:public))))
+           (file (jvm::make-class-file class jvm::+lisp-object+ '(:public))))
       (jvm::class-add-field file (jvm::make-field "ABC" :int))
       (jvm::class-add-field file (jvm::make-field "ABD" jvm::+lisp-object+))
-      (jvm::class-add-method file (jvm::!make-method "MBC" nil '(:int)))
+      (jvm::class-add-method file (jvm::make-method "MBC" nil '(:int)))
       (jvm::class-add-method file
-                             (jvm::!make-method "MBD" nil
+                             (jvm::make-method "MBD" nil
                                                 (list jvm::+lisp-object+)))
       (jvm::finalize-class-file file)
@@ -187 +187 @@
 (deftest generate-method.1
     (let* ((class (jvm::make-class-name "org/armedbear/lisp/gm_1"))
-           (file (jvm::!make-class-file class jvm::+lisp-object+ '(:public)))
-           (method (jvm::!make-method :class-constructor :void nil
+           (file (jvm::make-class-file class jvm::+lisp-object+ '(:public)))
+           (method (jvm::make-method :class-constructor :void nil
                                       :flags '(:static))))
       (jvm::class-add-method file method)
@@ -195 +195 @@
       (jvm::finalize-class-file file)
       (with-open-stream (stream (sys::%make-byte-array-output-stream))
-        (jvm::!write-class-file file stream)
+        (jvm::write-class-file file stream)
         (sys::load-compiled-function (sys::%get-output-stream-bytes stream)))
       T)
@@ -202 +202 @@
 (deftest generate-method.2
     (let* ((class (jvm::make-class-name "org/armedbear/lisp/gm_2"))
-           (file (jvm::!make-class-file class jvm::+lisp-object+ '(:public)))
-           (method (jvm::!make-method "doNothing" :void nil)))
+           (file (jvm::make-class-file class jvm::+lisp-object+ '(:public)))
+           (method (jvm::make-method "doNothing" :void nil)))
       (jvm::class-add-method file method)
       (jvm::with-code-to-method (file method)
@@ -219 +219 @@
       (jvm::finalize-class-file file)
       (with-open-stream (stream (sys::%make-byte-array-output-stream))
-        (jvm::!write-class-file file stream)
+        (jvm::write-class-file file stream)
         (sys::load-compiled-function (sys::%get-output-stream-bytes stream)))
       T)
@@ -227 +227 @@
 (deftest generate-method.3
     (let* ((class (jvm::make-class-name "org.armedbear.lisp.gm_3"))
-           (file (jvm::!make-class-file class jvm::+lisp-primitive+ '(:public)))
+           (file (jvm::make-class-file class jvm::+lisp-primitive+ '(:public)))
            )
-      (let ((method (jvm::!make-method :constructor :void nil)))
+      (let ((method (jvm::make-method :constructor :void nil)))
         (jvm::class-add-method file method)
         (jvm::with-code-to-method (file method)
@@ -239 +239 @@
                                               jvm::+lisp-object+))
           (jvm::emit 'return)))
-      (let ((method (jvm::!make-method "execute" jvm::+lisp-object+ nil)))
+      (let ((method (jvm::make-method "execute" jvm::+lisp-object+ nil)))
         (jvm::class-add-method file method)
         (jvm::with-code-to-method (file method)
@@ -246 +246 @@
       (jvm::finalize-class-file file)
       (with-open-stream (stream (sys::%make-byte-array-output-stream))
-        (jvm::!write-class-file file stream)
+        (jvm::write-class-file file stream)
         (funcall (sys::load-compiled-function (sys::%get-output-stream-bytes stream)))))
   NIL)
@@ -254 +254 @@
 (deftest generate-method.4
     (let* ((class (jvm::make-class-name "org.armedbear.lisp.gm_4"))
-           (file (jvm::!make-class-file class jvm::+lisp-primitive+ '(:public)))
+           (file (jvm::make-class-file class jvm::+lisp-primitive+ '(:public)))
            )
-      (jvm::class-add-field file (jvm::!make-field "N1" jvm::+lisp-object+
+      (jvm::class-add-field file (jvm::make-field "N1" jvm::+lisp-object+
                                                   :flags '(:static :private)))
-      (let ((method (jvm::!make-method :class-constructor :void nil :flags '(:static))))
+      (let ((method (jvm::make-method :class-constructor :void nil :flags '(:static))))
         (jvm::class-add-method file method)
         (jvm::with-code-to-method (file method)
@@ -264 +264 @@
           (jvm::emit-putstatic class "N1" jvm::+lisp-object+)
           (jvm::emit 'return)))
-      (let ((method (jvm::!make-method :constructor :void nil)))
+      (let ((method (jvm::make-method :constructor :void nil)))
         (jvm::class-add-method file method)
         (jvm::with-code-to-method (file method)
@@ -274 +274 @@
                                               jvm::+lisp-object+))
           (jvm::emit 'return)))
-      (let ((method (jvm::!make-method "execute" jvm::+lisp-object+ nil)))
+      (let ((method (jvm::make-method "execute" jvm::+lisp-object+ nil)))
         (jvm::class-add-method file method)
         (jvm::with-code-to-method (file method)
@@ -281 +281 @@
       (jvm::finalize-class-file file)
       (with-open-stream (stream (sys::%make-byte-array-output-stream))
-        (jvm::!write-class-file file stream)
+        (jvm::write-class-file file stream)
         (funcall (sys::load-compiled-function (sys::%get-output-stream-bytes stream)))))
   NIL)
@@ -289 +289 @@
 (deftest generate-method.5
     (let* ((class (jvm::make-class-name "org.armedbear.lisp.gm_5"))
-           (file (jvm::!make-class-file class jvm::+lisp-primitive+ '(:public)))
+           (file (jvm::make-class-file class jvm::+lisp-primitive+ '(:public)))
            )
-      (let ((method (jvm::!make-method :constructor :void nil)))
+      (let ((method (jvm::make-method :constructor :void nil)))
         (jvm::class-add-method file method)
         (jvm::with-code-to-method (file method)
@@ -301 +301 @@
                                               jvm::+lisp-object+))
           (jvm::emit 'return)))
-      (let ((method (jvm::!make-method "execute" jvm::+lisp-object+ nil)))
+      (let ((method (jvm::make-method "execute" jvm::+lisp-object+ nil)))
         (jvm::class-add-method file method)
         (jvm::with-code-to-method (file method)
           (jvm::emit-getstatic jvm::+lisp+ "NIL" jvm::+lisp-object+)
           (jvm::emit 'jvm::areturn)))
-      (let ((method (jvm::!make-method "execute" jvm::+lisp-object+
+      (let ((method (jvm::make-method "execute" jvm::+lisp-object+
                                        (list jvm::+lisp-object+))))
         (jvm::class-add-method file method)
@@ -314 +314 @@
       (jvm::finalize-class-file file)
       (with-open-stream (stream (sys::%make-byte-array-output-stream))
-        (jvm::!write-class-file file stream)
+        (jvm::write-class-file file stream)
         (let* ((bytes (sys::%get-output-stream-bytes stream))
                (fn (sys::load-compiled-function bytes)))
@@ -323 +323 @@
 (deftest with-code-to-method.1
     (let* ((class (jvm::make-class-name "org/armedbear/lisp/gm_6"))
-           (file (jvm::!make-class-file class jvm::+lisp-object+ '(:public)))
-           (method (jvm::!make-method :class-constructor :void nil
+           (file (jvm::make-class-file class jvm::+lisp-object+ '(:public)))
+           (method (jvm::make-method :class-constructor :void nil
               :flags '(:static)))
      (registers nil))
@@ -347 +347 @@
 (deftest with-code-to-method.2
     (let* ((class (jvm::make-class-name "org/armedbear/lisp/gm_7"))
-           (file (jvm::!make-class-file class jvm::+lisp-object+ '(:public)))
-           (method1 (jvm::!make-method :class-constructor :void nil
+           (file (jvm::make-class-file class jvm::+lisp-object+ '(:public)))
+           (method1 (jvm::make-method :class-constructor :void nil
                :flags '(:static)))
-     (method2 (jvm::!make-method "method2" :void nil))
+     (method2 (jvm::make-method "method2" :void nil))
      (registers nil))
       (jvm::class-add-method file method1)
@@ -375 +375 @@
 ;; (deftest generate-method.6
 ;;     (let* ((class (jvm::make-class-name "org.armedbear.lisp.gm_6"))
-;;            (file (jvm::!make-class-file class jvm::+lisp-primitive+ '(:public)))
+;;            (file (jvm::make-class-file class jvm::+lisp-primitive+ '(:public)))
 ;;            )
-;;       (let ((method (jvm::!make-method :constructor :void nil)))
+;;       (let ((method (jvm::make-method :constructor :void nil)))
 ;;         (jvm::class-add-method file method)
 ;;         (jvm::with-code-to-method (file method)
@@ -387 +387 @@
 ;;                                               jvm::+lisp-object+))
 ;;           (jvm::emit 'return)))
-;;       (let ((method (jvm::!make-method "execute" jvm::+lisp-object+ nil)))
+;;       (let ((method (jvm::make-method "execute" jvm::+lisp-object+ nil)))
 ;;         (jvm::class-add-method file method)
 ;;         (jvm::with-code-to-method (file method)
@@ -394 +394 @@
 ;;       (jvm::finalize-class-file file)
 ;;       (with-open-stream (stream (sys::%make-byte-array-output-stream))
-;;         (jvm::!write-class-file file stream)
+;;         (jvm::write-class-file file stream)
 ;;         (ignore-errors (sys::load-compiled-function nil))
 ;;         (funcall (sys::load-compiled-function (sys::%get-output-stream-bytes stream))))