[armedbear-cvs] r13999 - trunk/abcl/src/org/armedbear/lisp

[rschlatte at common-lisp.net]

Author: rschlatte
Date: Tue Jul 10 13:46:34 2012
New Revision: 13999

Log:
Introduce a "continue" restart for delete-package

- Fixes ansi test DELETE-PACKAGE.6

Modified:
   trunk/abcl/src/org/armedbear/lisp/Autoload.java
   trunk/abcl/src/org/armedbear/lisp/PackageFunctions.java
   trunk/abcl/src/org/armedbear/lisp/package.lisp

Modified: trunk/abcl/src/org/armedbear/lisp/Autoload.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Autoload.java	Mon Jul  9 02:47:36 2012	(r13998)
+++ trunk/abcl/src/org/armedbear/lisp/Autoload.java	Tue Jul 10 13:46:34 2012	(r13999)
@@ -381,7 +381,7 @@
         autoload("cos", "MathFunctions");
         autoload("cosh", "MathFunctions");
         autoload("delete-file", "delete_file");
-        autoload("delete-package", "PackageFunctions");
+        autoload("%delete-package", "PackageFunctions");
         autoload("echo-stream-input-stream", "EchoStream");
         autoload("echo-stream-output-stream", "EchoStream");
         autoload("exp", "MathFunctions");

Modified: trunk/abcl/src/org/armedbear/lisp/PackageFunctions.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/PackageFunctions.java	Mon Jul  9 02:47:36 2012	(r13998)
+++ trunk/abcl/src/org/armedbear/lisp/PackageFunctions.java	Tue Jul 10 13:46:34 2012	(r13999)
@@ -204,9 +204,9 @@
         }
     };
 
-    // ### delete-package
-    private static final Primitive DELETE_PACKAGE =
-        new Primitive("delete-package", "package")
+    // ### %delete-package
+    private static final Primitive _DELETE_PACKAGE =
+        new Primitive("%delete-package", PACKAGE_SYS, false)
     {
         @Override
         public LispObject execute(LispObject arg)

Modified: trunk/abcl/src/org/armedbear/lisp/package.lisp
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/package.lisp	Mon Jul  9 02:47:36 2012	(r13998)
+++ trunk/abcl/src/org/armedbear/lisp/package.lisp	Tue Jul 10 13:46:34 2012	(r13999)
@@ -93,3 +93,6 @@
           :report "Skip symbol"))))
   T)
 
+(defun delete-package (package)
+  (with-simple-restart (continue "Ignore missing package.")
+    (sys::%delete-package package)))