[Sbcl-commits] CVS: sbcl/src/pcl boot.lisp,1.127,1.128

[Juho S. <js...@us...>]

Update of /cvsroot/sbcl/sbcl/src/pcl
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv32211/src/pcl

Modified Files:
	boot.lisp 
Log Message:
0.9.18.64:
        Add a REPLACE restart for the annoying "FOO already names an ordinary
        function or a macro" error for DEFGENERIC.


Index: boot.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/pcl/boot.lisp,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -d -r1.127 -r1.128
--- boot.lisp	13 Nov 2006 07:20:21 -0000	1.127
+++ boot.lisp	20 Nov 2006 10:28:00 -0000	1.128
@@ -1603,7 +1603,12 @@
     (if (and existing
              (eq *boot-state* 'complete)
              (null (generic-function-p existing)))
-        (generic-clobbers-function fun-name)
+        (restart-case
+            (generic-clobbers-function fun-name)
+          (replace ()
+            :report "Replace the function binding"
+            (fmakunbound fun-name)
+            (apply #'ensure-generic-function fun-name all-keys)))
         (apply #'ensure-generic-function-using-class
                existing fun-name all-keys))))