Changeset 10293


Ignore:
Timestamp:
10/31/05 04:04:42 (16 years ago)
Author:
piso
Message:

SIMPLE-CONDITION-FORMAT-CONTROL
SIMPLE-CONDITION-FORMAT-ARGUMENTS

File:
1 edited

Legend:

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

    r9489 r10293  
    33 *
    44 * Copyright (C) 2003-2005 Peter Graves
    5  * $Id: SimpleCondition.java,v 1.12 2005-06-22 17:46:58 piso Exp $
     5 * $Id: SimpleCondition.java,v 1.13 2005-10-31 04:04:42 piso Exp $
    66 *
    77 * This program is free software; you can redistribute it and/or
     
    7272        public LispObject execute(LispObject arg) throws ConditionThrowable
    7373        {
    74             if (arg instanceof Condition)
    75                 return ((Condition)arg).getFormatControl();
    76             return signal(new TypeError(arg, Symbol.CONDITION));
     74            if (arg instanceof StandardObject)
     75                return ((StandardObject)arg).getInstanceSlotValue(Symbol.FORMAT_CONTROL);
     76            return signalTypeError(arg, Symbol.STANDARD_OBJECT);
    7777        }
    7878    };
     
    8484        public LispObject execute(LispObject arg) throws ConditionThrowable
    8585        {
    86             if (arg instanceof Condition)
    87                 return ((Condition)arg).getFormatArguments();
    88             return signal(new TypeError(arg, Symbol.CONDITION));
     86            if (arg instanceof StandardObject)
     87                return ((StandardObject)arg).getInstanceSlotValue(Symbol.FORMAT_ARGUMENTS);
     88            return signalTypeError(arg, Symbol.STANDARD_OBJECT);
    8989        }
    9090    };
Note: See TracChangeset for help on using the changeset viewer.