Changeset 3886

Timestamp:

09/19/03 12:20:34 (19 years ago)

Author:

piso

Message:

Conditions: work in progress.

Location:

trunk/j/src/org/armedbear/lisp

Files:

• CharacterInputStream.java (modified) (2 diffs)
• Lisp.java (modified) (2 diffs)
• Package.java (modified) (8 diffs)
• PackageError.java (modified) (2 diffs)
• PackageFunctions.java (modified) (2 diffs)
• Packages.java (modified) (2 diffs)
• Primitives.java (modified) (5 diffs)

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

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: CharacterInputStream.java,v 1.47 2003-09-19 01:46:40 piso Exp $
+ * $Id: CharacterInputStream.java,v 1.48 2003-09-19 12:20:34 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -630 +630 @@
             Package pkg = Packages.findPackage(packageName);
             if (pkg == null)
-                throw new PackageError("package \"" + packageName +
-                    "\" not found");
+                throw new ConditionThrowable(new PackageError("package \"" + packageName +
+                                                              "\" not found"));
             Symbol symbol = pkg.findExternalSymbol(symbolName);
             if (symbol != null)

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

@@ -3 +3 @@
  *
  * Copyright (C) 2002-2003 Peter Graves
- * $Id: Lisp.java,v 1.136 2003-09-19 12:10:27 piso Exp $
+ * $Id: Lisp.java,v 1.137 2003-09-19 12:20:34 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -771 +771 @@
         if (pkg != null)
             return pkg;
-        throw new PackageError(obj + " is not the name of a package");
+        throw new ConditionThrowable(new PackageError(obj + " is not the name of a package"));
     }
 

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

@@ -3 +3 @@
  *
  * Copyright (C) 2002-2003 Peter Graves
- * $Id: Package.java,v 1.44 2003-09-19 01:46:42 piso Exp $
+ * $Id: Package.java,v 1.45 2003-09-19 12:20:34 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -285 +285 @@
     }
 
-    public synchronized LispObject unintern(Symbol symbol) throws PackageError
+    public synchronized LispObject unintern(Symbol symbol) throws ConditionThrowable
     {
         final String symbolName = symbol.getName();
@@ -311 +311 @@
                         sb.append(" and ");
                         sb.append(s.getQualifiedName());
-                        throw new PackageError(sb.toString());
+                        throw new ConditionThrowable(new PackageError(sb.toString()));
                     }
                 }
@@ -344 +344 @@
             sb.append(" is already accessible in package ");
             sb.append(name);
-            throw new PackageError(sb.toString());
+            throw new ConditionThrowable(new PackageError(sb.toString()));
         }
         internalSymbols.put(symbol.getName(), symbol);
@@ -359 +359 @@
                 sb.append(" is not accessible in package ");
                 sb.append(name);
-                throw new PackageError(sb.toString());
+                throw new ConditionThrowable(new PackageError(sb.toString()));
             }
             if (sym != symbol) {
@@ -367 +367 @@
                 sb.append(" is already accessible in package ");
                 sb.append(name);
-                throw new PackageError(sb.toString());
+                throw new ConditionThrowable(new PackageError(sb.toString()));
             }
             internalSymbols.put(symbolName, symbol);
@@ -404 +404 @@
         sb.append(" is not accessible in package ");
         sb.append(name);
-        throw new PackageError(sb.toString());
+        throw new ConditionThrowable(new PackageError(sb.toString()));
     }
 
@@ -426 +426 @@
             sb.append(" is not accessible in package ");
             sb.append(name);
-            throw new PackageError(sb.toString());
+            throw new ConditionThrowable(new PackageError(sb.toString()));
         }
     }

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

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: PackageError.java,v 1.1 2003-05-24 15:06:46 piso Exp $
+ * $Id: PackageError.java,v 1.2 2003-09-19 12:20:34 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -22 +22 @@
 package org.armedbear.lisp;
 
-public class PackageError extends LispError
+public class PackageError extends Condition
 {
+    private String message;
+
     public PackageError()
     {
-        super();
     }
 
     public PackageError(String message)
     {
-        super(message);
+        this.message = message;
+    }
+
+    public LispObject typep(LispObject type) throws ConditionThrowable
+    {
+        if (type == Symbol.PACKAGE_ERROR)
+            return T;
+        if (type == Symbol.ERROR)
+            return T;
+        return super.typep(type);
     }
 }

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

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: PackageFunctions.java,v 1.17 2003-09-19 01:46:42 piso Exp $
+ * $Id: PackageFunctions.java,v 1.18 2003-09-19 12:20:34 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -256 +256 @@
                     String nick = javaString(list.car());
                     if (Packages.findPackage(nick) != null) {
-                        throw new PackageError("a package named " + nick +
-                                            " already exists");
+                        throw new ConditionThrowable(new PackageError("a package named " + nick +
+                                                                      " already exists"));
                     }
                     list = list.cdr();

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

@@ -3 +3 @@
  *
  * Copyright (C) 2002-2003 Peter Graves
- * $Id: Packages.java,v 1.9 2003-09-19 01:46:42 piso Exp $
+ * $Id: Packages.java,v 1.10 2003-09-19 12:20:34 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -90 +90 @@
     {
         if (map.get(nickname) != null)
-            throw new PackageError("a package named " + nickname +
-                                   " already exists");
+            throw new ConditionThrowable(new PackageError("a package named " + nickname +
+                                                          " already exists"));
         map.put(nickname, pkg);
     }

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

@@ -3 +3 @@
  *
  * Copyright (C) 2002-2003 Peter Graves
- * $Id: Primitives.java,v 1.407 2003-09-19 12:10:27 piso Exp $
+ * $Id: Primitives.java,v 1.408 2003-09-19 12:20:34 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -1150 +1150 @@
             if (datum instanceof Symbol) {
                 if (datum == Symbol.PACKAGE_ERROR)
-                    throw new PackageError(_format(args, 1));
+                    throw new ConditionThrowable(new PackageError(_format(args, 1)));
                 if (datum == Symbol.PARSE_ERROR)
                     throw new ConditionThrowable(new ParseError(_format(args, 1)));
@@ -1798 +1798 @@
             return c.getCondition() instanceof TypeError;
         if (type == Symbol.PACKAGE_ERROR)
-            return c instanceof PackageError;
+            return c.getCondition() instanceof PackageError;
         if (type == Symbol.PARSE_ERROR)
             return c.getCondition() instanceof ParseError;
@@ -2629 +2629 @@
                     String nick = javaString(list.car());
                     if (Packages.findPackage(nick) != null) {
-                        throw new PackageError("a package named " + nick +
-                                               " already exists");
+                        throw new ConditionThrowable(new PackageError("a package named " + nick +
+                                                                      " already exists"));
                     }
                     list = list.cdr();
@@ -2687 +2687 @@
             Package pkg = Packages.findPackage(packageName);
             if (pkg == null)
-                throw new PackageError("package " + arg + " does not exist");
+                throw new ConditionThrowable(new PackageError("package " + arg + " does not exist"));
             LispThread thread = LispThread.currentThread();
             Environment dynEnv = thread.getDynamicEnvironment();