source: trunk/abcl/src/org/armedbear/lisp/ArithmeticError.java

Last change on this file was 15519, checked in by Mark Evenson, 3 years ago

Fix and standardize all error reader functions

Fixes #388, replaces #389. The reader function stream-error-stream
signals a type-error if it's applied to conditions that's typep to
stream-error, but whose class is a subtype to stream-error:

`lisp
(define-condition broken-error (stream-error) ())

BROKEN-ERROR

(stream-error-stream (make-condition 'stream-error :stream (make-string-input-stream "foo")))

#S(SYSTEM::STRING-INPUT-STREAM)

(stream-error-stream (make-condition 'broken-error :stream (make-string-input-stream "foo")))

#<THREAD "interpreter" {2075326}>: Debugger invoked on condition of type TYPE-ERROR

The value #<BROKEN-ERROR {75A83798}> is not of type STREAM-ERROR.

`

This fault exists within these reader functions:

  • file-error-pathname (almost -- instead of a type-error, the function returns NIL instead.)
  • package-error-package
  • arithmetic-error-operation
  • arithmetic-error-operands

The fault exists because the Java code checks if its argument is
instanceof its respective Java class. So, the method will fail on any
conditions defined in CL that subclass these errors.

Furthermore, some reader functions only check if they're instanceof
StandardObject?, which allows any CLOS object to succeed as long as the
slot the primitive method is looking for exists:

  • cell-error-name
  • type-error-datum
  • type-error-expected-type

Finally, some reader functions exist in standalone Java files, while
others reside in its condition's class file, adding to some
organizational clutter.

This change fills two main jobs:

  • Standardize all reader functions to the same behavior: If the argument is typep to the right condition, return the right slot value. Otherwise, signal a type error.
  • Move standalone reader Java code to the files of errors they apply to.

As an aside, this change would make ABCL's reader functions conformant
to a wave of proposals for WSCL:

  • Property svn:eol-style set to native
  • Property svn:keywords set to Id
File size: 4.6 KB
Line 
1/*
2 * ArithmeticError.java
3 *
4 * Copyright (C) 2003-2005 Peter Graves
5 * $Id: ArithmeticError.java 15519 2021-09-19 08:54:57Z mevenson $
6 *
7 * This program is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU General Public License
9 * as published by the Free Software Foundation; either version 2
10 * of the License, or (at your option) any later version.
11 *
12 * This program is distributed in the hope that it will be useful,
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
15 * GNU General Public License for more details.
16 *
17 * You should have received a copy of the GNU General Public License
18 * along with this program; if not, write to the Free Software
19 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
20 *
21 * As a special exception, the copyright holders of this library give you
22 * permission to link this library with independent modules to produce an
23 * executable, regardless of the license terms of these independent
24 * modules, and to copy and distribute the resulting executable under
25 * terms of your choice, provided that you also meet, for each linked
26 * independent module, the terms and conditions of the license of that
27 * module.  An independent module is a module which is not derived from
28 * or based on this library.  If you modify this library, you may extend
29 * this exception to your version of the library, but you are not
30 * obligated to do so.  If you do not wish to do so, delete this
31 * exception statement from your version.
32 */
33
34package org.armedbear.lisp;
35
36import static org.armedbear.lisp.Lisp.*;
37
38public class ArithmeticError extends LispError
39{
40    protected ArithmeticError(LispClass cls)
41    {
42        super(cls);
43    }
44
45    public ArithmeticError(LispObject initArgs)
46    {
47        super(StandardClass.ARITHMETIC_ERROR);
48        initialize(initArgs);
49    }
50
51    @Override
52    protected void initialize(LispObject initArgs)
53    {
54        super.initialize(initArgs);
55        LispObject operation = NIL;
56        LispObject operands = NIL;
57        LispObject first, second;
58        while (initArgs != NIL) {
59            first = initArgs.car();
60            initArgs = initArgs.cdr();
61            second = initArgs.car();
62            initArgs = initArgs.cdr();
63            if (first == Keyword.OPERATION)
64                operation = second;
65            else if (first == Keyword.OPERANDS)
66                operands = second;
67        }
68        setOperation(operation);
69        setOperands(operands);
70    }
71
72    public ArithmeticError(String message)
73    {
74        super(StandardClass.ARITHMETIC_ERROR);
75        setFormatControl(message.replaceAll("~","~~"));
76        setFormatArguments(NIL);
77        setOperation(NIL);
78        setOperands(NIL);
79    }
80
81    @Override
82    public LispObject typeOf()
83    {
84        return Symbol.ARITHMETIC_ERROR;
85    }
86
87    @Override
88    public LispObject classOf()
89    {
90        return StandardClass.ARITHMETIC_ERROR;
91    }
92
93    @Override
94    public LispObject typep(LispObject type)
95    {
96        if (type == Symbol.ARITHMETIC_ERROR)
97            return T;
98        if (type == StandardClass.ARITHMETIC_ERROR)
99            return T;
100        return super.typep(type);
101    }
102
103    final LispObject getOperation()
104    {
105        return getInstanceSlotValue(Symbol.OPERATION);
106    }
107
108    private final void setOperation(LispObject operation)
109
110    {
111        setInstanceSlotValue(Symbol.OPERATION, operation);
112    }
113
114    final LispObject getOperands()
115    {
116        return getInstanceSlotValue(Symbol.OPERANDS);
117    }
118
119    private final void setOperands(LispObject operands)
120
121    {
122        setInstanceSlotValue(Symbol.OPERANDS, operands);
123    }
124
125    // ### arithmetic-error-operation
126    private static final Primitive ARITHMETIC_ERROR_OPERATION =
127        new Primitive("arithmetic-error-operation", "condition")
128    {
129        @Override
130        public LispObject execute(LispObject arg)
131        {
132            if (arg.typep(Symbol.ARITHMETIC_ERROR) == NIL) {
133                return type_error(arg, Symbol.ARITHMETIC_ERROR);
134            }
135
136            final StandardObject obj = (StandardObject) arg;
137            return obj.getInstanceSlotValue(Symbol.OPERATION);
138        }
139    };
140
141    // ### arithmetic-error-operands
142    private static final Primitive ARITHMETIC_ERROR_OPERANDS =
143        new Primitive("arithmetic-error-operands", "condition")
144    {
145        @Override
146        public LispObject execute(LispObject arg)
147        {
148            if (arg.typep(Symbol.ARITHMETIC_ERROR) == NIL) {
149                return type_error(arg, Symbol.ARITHMETIC_ERROR);
150            }
151
152            final StandardObject obj = (StandardObject) arg;
153            return obj.getInstanceSlotValue(Symbol.OPERANDS);
154        }
155    };
156}
Note: See TracBrowser for help on using the repository browser.