Changeset 3621

Timestamp:

09/08/03 15:19:29 (19 years ago)

Author:

piso

Message:

(subtypep 'character 'base-char) => t

File:

• trunk/j/src/org/armedbear/lisp/Type.java (modified) (7 diffs)

trunk/j/src/org/armedbear/lisp/Type.java

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: Type.java,v 1.15 2003-08-12 15:22:57 piso Exp $
+ * $Id: Type.java,v 1.16 2003-09-08 15:19:29 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -29 +29 @@
     private static final HashMap map = new HashMap();
 
-    private final ArrayList superTypes = new ArrayList();
+    private final ArrayList supertypes = new ArrayList();
 
     private final Symbol symbol;
@@ -41 +41 @@
     }
 
-    private Type(Symbol symbol, Type superType)
+    private Type(Symbol symbol, Type supertype)
     {
         this.symbol = symbol;
@@ -47 +47 @@
             map.put(symbol, this);
         }
-        synchronized (superTypes) {
-            superTypes.add(superType);
-        }
-    }
-
-    private Type(Symbol symbol, Type superType1, Type superType2)
+        synchronized (supertypes) {
+            supertypes.add(supertype);
+        }
+    }
+
+    private Type(Symbol symbol, Type supertype1, Type supertype2)
     {
         this.symbol = symbol;
@@ -58 +58 @@
             map.put(symbol, this);
         }
-        synchronized (superTypes) {
-            superTypes.add(superType1);
-            superTypes.add(superType2);
+        synchronized (supertypes) {
+            supertypes.add(supertype1);
+            supertypes.add(supertype2);
+        }
+    }
+
+    private void addSupertype(Type supertype)
+    {
+        synchronized (supertypes) {
+            supertypes.add(supertype);
         }
     }
@@ -107 +114 @@
         if (otherType == this)
             return true;
-        for (int i = 0; i < superTypes.size(); i++) {
-            if (superTypes.get(i) == otherType)
+        for (int i = 0; i < supertypes.size(); i++) {
+            if (supertypes.get(i) == otherType)
                 return true;
         }
-        for (int i = 0; i < superTypes.size(); i++) {
-            Type superType = (Type) superTypes.get(i);
-            if (superType._isSubtypeOf(otherType))
+        for (int i = 0; i < supertypes.size(); i++) {
+            Type supertype = (Type) supertypes.get(i);
+            if (supertype._isSubtypeOf(otherType))
                 return true;
         }
@@ -172 +179 @@
     public static final Type STANDARD_CHAR =
         new Type(Symbol.STANDARD_CHAR, BASE_CHAR);
+
+    static {
+        CHARACTER.addSupertype(BASE_CHAR);
+    }
 
     // Subtypes of NUMBER