Changeset 3710

Timestamp:

09/11/03 16:19:25 (19 years ago)

Author:

piso

Message:

Work in progress.

Location:

trunk/j/src/org/armedbear/lisp

Files:

• ClassTypeSpecifier.java (modified) (2 diffs)
• CompoundTypeSpecifier.java (modified) (2 diffs)
• IntegerTypeSpecifier.java (modified) (3 diffs)

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

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: ClassTypeSpecifier.java,v 1.1 2003-07-15 17:31:56 piso Exp $
+ * $Id: ClassTypeSpecifier.java,v 1.2 2003-09-11 16:18:21 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -42 +42 @@
             Type type = Type.findType(c);
             if (type != null)
-                return type.isSubtypeOf(ats.getType());
+                return type.isSubtypeOf(ats.TYPE());
         }
-
-        LispObject[] values = new LispObject[2];
-        values[0] = NIL;
-        values[1] = NIL;
-        LispThread.currentThread().setValues(values);
-        return NIL;
+        return values(NIL, NIL);
     }
 }

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

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: CompoundTypeSpecifier.java,v 1.5 2003-08-14 17:23:55 piso Exp $
+ * $Id: CompoundTypeSpecifier.java,v 1.6 2003-09-11 16:17:42 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -41 +41 @@
         if (car == Symbol.SIMPLE_VECTOR)
             return new SimpleVectorTypeSpecifier(cons);
+        if (car == Symbol.INTEGER)
+            return new IntegerTypeSpecifier(cons);
+        if (car == Symbol.MEMBER)
+            return new MemberTypeSpecifier(cons);
         throw new LispError("unsupported compound type specifier " + args);
     }

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

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: IntegerTypeSpecifier.java,v 1.1 2003-09-11 14:54:27 piso Exp $
+ * $Id: IntegerTypeSpecifier.java,v 1.2 2003-09-11 16:19:25 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -92 +92 @@
         if (ts instanceof AtomicTypeSpecifier) {
             AtomicTypeSpecifier ats = (AtomicTypeSpecifier) ts;
-            Type type = ats.getType();
+            Type type = ats.TYPE();
             if (type == Type.INTEGER)
                 return T;
@@ -118 +118 @@
                     return values(T, T);
         }
-        return super.isSubtypeOf(ts);
+        return values(NIL, NIL);
     }
 }