Changeset 3629

Timestamp:

09/08/03 18:05:27 (20 years ago)

Author:

piso

Message:

Work in progress.

File:

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

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

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: Type.java,v 1.18 2003-09-08 17:41:49 piso Exp $
+ * $Id: Type.java,v 1.19 2003-09-08 18:05:27 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -110 +110 @@
     }
 
-    public final boolean _isSubtypeOf(Type otherType)
+    public boolean _isSubtypeOf(Type otherType)
     {
         if (otherType == this)
@@ -138 +138 @@
     public static final Type TYPE_T    = new Type(Symbol.T);
 
+    public static final Type TYPE_NIL  = new Type((Symbol)NIL) {
+        public boolean _isSubtypeOf(Type otherType)
+        {
+            return true;
+        }
+    };
+
     public static final Type ATOM      = new Type(Symbol.ATOM, TYPE_T);
-    public static final Type SYMBOL    = new Type(Symbol.SYMBOL, TYPE_T);
+    public static final Type SYMBOL    = new Type(Symbol.SYMBOL, TYPE_T, ATOM);
     public static final Type SEQUENCE  = new Type(Symbol.SEQUENCE, TYPE_T);
     public static final Type ARRAY     = new Type(Symbol.ARRAY, TYPE_T);
-    public static final Type CHARACTER = new Type(Symbol.CHARACTER, TYPE_T);
-    public static final Type NUMBER    = new Type(Symbol.NUMBER, TYPE_T);
+    public static final Type CHARACTER = new Type(Symbol.CHARACTER, TYPE_T, ATOM);
+    public static final Type NUMBER    = new Type(Symbol.NUMBER, TYPE_T, ATOM);
     public static final Type STREAM    = new Type(Symbol.STREAM, TYPE_T);
     public static final Type CONDITION = new Type(Symbol.CONDITION, TYPE_T);
+    public static final Type FUNCTION  = new Type(Symbol.FUNCTION, TYPE_T);
+    public static final Type STANDARD_OBJECT =
+        new Type(Symbol.STANDARD_OBJECT, TYPE_T);
 
     // Subtypes of SYMBOL
     public static final Type BOOLEAN   = new Type(Symbol.BOOLEAN, SYMBOL);
-    public static final Type KEYWORD   = new Type(Symbol.KEYWORD, SYMBOL, ATOM);
+    public static final Type KEYWORD   = new Type(Symbol.KEYWORD, SYMBOL);
 
     // Subtypes of SEQUENCE
@@ -180 +190 @@
     public static final Type BASE_CHAR = new Type(Symbol.BASE_CHAR, CHARACTER);
     public static final Type EXTENDED_CHAR =
-        new Type(Symbol.EXTENDED_CHAR, CHARACTER);
+        new Type(Symbol.EXTENDED_CHAR, CHARACTER, TYPE_NIL);
     public static final Type STANDARD_CHAR =
         new Type(Symbol.STANDARD_CHAR, BASE_CHAR);