Changeset 3947

Timestamp:

09/21/03 01:57:31 (19 years ago)

Author:

piso

Message:

extends LispError? => extends CellError?

Location:

trunk/j/src/org/armedbear/lisp

Files:

• UnboundVariable.java (modified) (2 diffs)
• UndefinedFunction.java (modified) (4 diffs)

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

@@ -3 +3 @@
  *
  * Copyright (C) 2002-2003 Peter Graves
- * $Id: UnboundVariable.java,v 1.2 2003-09-20 17:02:05 piso Exp $
+ * $Id: UnboundVariable.java,v 1.3 2003-09-21 01:56:58 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -22 +22 @@
 package org.armedbear.lisp;
 
-public final class UnboundVariable extends LispError
+public final class UnboundVariable extends CellError
 {
-    private final String name;
-
-    public UnboundVariable(String name)
+    // obj is either the unbound variable itself or an initArgs list.
+    public UnboundVariable(LispObject obj) throws ConditionThrowable
     {
-        this.name = name;
+        super(obj instanceof Cons ? obj : list2(Keyword.NAME, obj));
     }
 
     public String getMessage()
     {
-        if (name == null)
-            return "unbound variable";
-        return "the variable " + name + " has no value";
+        return "the variable " + getCellName() + " has no value";
     }
 

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

@@ -3 +3 @@
  *
  * Copyright (C) 2002-2003 Peter Graves
- * $Id: UndefinedFunction.java,v 1.3 2003-09-21 01:41:51 piso Exp $
+ * $Id: UndefinedFunction.java,v 1.4 2003-09-21 01:57:31 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -22 +22 @@
 package org.armedbear.lisp;
 
-public final class UndefinedFunction extends LispError
+public final class UndefinedFunction extends CellError
 {
-    private final LispObject object;
-    private final String name;
-
-    public UndefinedFunction(LispObject object)
+    // obj is either the undefined function itself or an initArgs list.
+    public UndefinedFunction(LispObject obj) throws ConditionThrowable
     {
-        this.object = object;
-        this.name = null;
+        super(obj instanceof Cons ? obj : list2(Keyword.NAME, obj));
     }
 
@@ -47 +44 @@
         if (type == Symbol.UNDEFINED_FUNCTION)
             return T;
+        if (type == BuiltInClass.UNDEFINED_FUNCTION)
+            return T;
         return super.typep(type);
     }
@@ -53 +52 @@
     {
         StringBuffer sb = new StringBuffer("undefined function");
-        if (name != null) {
-            sb.append(' ');
-            sb.append(name);
-        } else if (object != null) {
-            sb.append(' ');
-            sb.append(String.valueOf(object));
-        }
+        sb.append(' ');
+        sb.append(String.valueOf(getCellName()));
         return sb.toString();
     }