Changeset 3889


Ignore:
Timestamp:
09/19/03 13:02:44 (19 years ago)
Author:
piso
Message:

Conditions: work in progress.

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

Legend:

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

    r2514 r3889  
    33 *
    44 * Copyright (C) 2003 Peter Graves
    5  * $Id: ControlError.java,v 1.1 2003-06-21 19:17:35 piso Exp $
     5 * $Id: ControlError.java,v 1.2 2003-09-19 13:02:43 piso Exp $
    66 *
    77 * This program is free software; you can redistribute it and/or
     
    2222package org.armedbear.lisp;
    2323
    24 public class ControlError extends LispError
     24public class ControlError extends Condition
    2525{
    2626    public ControlError()
    2727    {
    28         super();
    2928    }
    3029
     
    3332        super(message);
    3433    }
     34
     35    public LispObject typep(LispObject type) throws ConditionThrowable
     36    {
     37        if (type == Symbol.CONTROL_ERROR)
     38            return T;
     39        if (type == Symbol.ERROR)
     40            return T;
     41        return super.typep(type);
     42    }
    3543}
  • trunk/j/src/org/armedbear/lisp/Primitives.java

    r3888 r3889  
    33 *
    44 * Copyright (C) 2002-2003 Peter Graves
    5  * $Id: Primitives.java,v 1.410 2003-09-19 12:43:59 piso Exp $
     5 * $Id: Primitives.java,v 1.411 2003-09-19 13:02:44 piso Exp $
    66 *
    77 * This program is free software; you can redistribute it and/or
     
    18041804            return c.getCondition() instanceof ProgramError;
    18051805        if (type == Symbol.CONTROL_ERROR)
    1806             return c instanceof ControlError;
     1806            return c.getCondition() instanceof ControlError;
    18071807        if (type == Symbol.SIMPLE_ERROR)
    18081808            return c.getCondition() instanceof SimpleError;
  • trunk/j/src/org/armedbear/lisp/Throw.java

    r2515 r3889  
    33 *
    44 * Copyright (C) 2002-2003 Peter Graves
    5  * $Id: Throw.java,v 1.4 2003-06-21 19:18:17 piso Exp $
     5 * $Id: Throw.java,v 1.5 2003-09-19 13:02:44 piso Exp $
    66 *
    77 * This program is free software; you can redistribute it and/or
     
    2222package org.armedbear.lisp;
    2323
    24 public final class Throw extends ControlError
     24public final class Throw extends LispError
    2525{
    2626    private final LispObject tag;
Note: See TracChangeset for help on using the changeset viewer.