Changeset 3710


Ignore:
Timestamp:
09/11/03 16:19:25 (19 years ago)
Author:
piso
Message:

Work in progress.

Location:
trunk/j/src/org/armedbear/lisp
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/j/src/org/armedbear/lisp/ClassTypeSpecifier.java

    r2939 r3710  
    33 *
    44 * Copyright (C) 2003 Peter Graves
    5  * $Id: ClassTypeSpecifier.java,v 1.1 2003-07-15 17:31:56 piso Exp $
     5 * $Id: ClassTypeSpecifier.java,v 1.2 2003-09-11 16:18:21 piso Exp $
    66 *
    77 * This program is free software; you can redistribute it and/or
     
    4242            Type type = Type.findType(c);
    4343            if (type != null)
    44                 return type.isSubtypeOf(ats.getType());
     44                return type.isSubtypeOf(ats.TYPE());
    4545        }
    46 
    47         LispObject[] values = new LispObject[2];
    48         values[0] = NIL;
    49         values[1] = NIL;
    50         LispThread.currentThread().setValues(values);
    51         return NIL;
     46        return values(NIL, NIL);
    5247    }
    5348}
  • trunk/j/src/org/armedbear/lisp/CompoundTypeSpecifier.java

    r3383 r3710  
    33 *
    44 * Copyright (C) 2003 Peter Graves
    5  * $Id: CompoundTypeSpecifier.java,v 1.5 2003-08-14 17:23:55 piso Exp $
     5 * $Id: CompoundTypeSpecifier.java,v 1.6 2003-09-11 16:17:42 piso Exp $
    66 *
    77 * This program is free software; you can redistribute it and/or
     
    4141        if (car == Symbol.SIMPLE_VECTOR)
    4242            return new SimpleVectorTypeSpecifier(cons);
     43        if (car == Symbol.INTEGER)
     44            return new IntegerTypeSpecifier(cons);
     45        if (car == Symbol.MEMBER)
     46            return new MemberTypeSpecifier(cons);
    4347        throw new LispError("unsupported compound type specifier " + args);
    4448    }
  • trunk/j/src/org/armedbear/lisp/IntegerTypeSpecifier.java

    r3697 r3710  
    33 *
    44 * Copyright (C) 2003 Peter Graves
    5  * $Id: IntegerTypeSpecifier.java,v 1.1 2003-09-11 14:54:27 piso Exp $
     5 * $Id: IntegerTypeSpecifier.java,v 1.2 2003-09-11 16:19:25 piso Exp $
    66 *
    77 * This program is free software; you can redistribute it and/or
     
    9292        if (ts instanceof AtomicTypeSpecifier) {
    9393            AtomicTypeSpecifier ats = (AtomicTypeSpecifier) ts;
    94             Type type = ats.getType();
     94            Type type = ats.TYPE();
    9595            if (type == Type.INTEGER)
    9696                return T;
     
    118118                    return values(T, T);
    119119        }
    120         return super.isSubtypeOf(ts);
     120        return values(NIL, NIL);
    121121    }
    122122}
Note: See TracChangeset for help on using the changeset viewer.