Changeset 12581

Timestamp:

04/05/10 21:00:13 (13 years ago)

Author:

ehuelsmann

Message:

Make LispCharacter? constructor private in favor of getInstance();

this allows checking character validity later on - and returning an appropriate value.

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• JavaObject.java (modified) (1 diff)
• LispCharacter.java (modified) (1 diff)
• compiler-pass2.lisp (modified) (1 diff)

trunk/abcl/src/org/armedbear/lisp/JavaObject.java

@@ -216 +216 @@
 
         if (obj instanceof Character)
-            return new LispCharacter((Character)obj);
+            return LispCharacter.getInstance((Character)obj);
 
         if (obj instanceof Object[]) {

trunk/abcl/src/org/armedbear/lisp/LispCharacter.java

@@ -68 +68 @@
 
   // This needs to be public for the compiler.
-  public LispCharacter(char c)
+  private LispCharacter(char c)
   {
     this.value = c;

trunk/abcl/src/org/armedbear/lisp/compiler-pass2.lisp

@@ -2270 +2270 @@
      ;; no need to *declare-inline*: constants
     (declare-field g +lisp-character+ +field-access-private+)
-    (cond ((<= 0 n 255)
-           (emit 'getstatic +lisp-character-class+ "constants" +lisp-character-array+)
-           (emit-push-constant-int n)
-           (emit 'aaload))
-          (t
-           (emit 'new +lisp-character-class+)
-           (emit 'dup)
-           (emit-push-constant-int n)
-           (emit-invokespecial-init +lisp-character-class+ '("C"))))
+    (emit-push-constant-int n)
+    (emit-invokestatic +lisp-character-class+ "getInstance" '("C")
+                       +lisp-character+)
     (emit 'putstatic *this-class* g +lisp-character+)
     (setf *static-code* *code*)