Changeset 15085 for trunk/abcl/src/org/armedbear/lisp/clos.lisp

Timestamp:

06/15/17 05:38:38 (6 years ago)

Author:

Mark Evenson

Message:

Restart for when methods are defined over functions or macros, and when arglists don't match
(Alan Ruttenberg)

For those following along at home with the source code, you will
probably need to recompile your local FASLs after this change.

From <​https://github.com/armedbear/abcl/pull/54/commits/7548151612417bb82ef3ee86a2d7670505b328bb>.

Merges <​https://github.com/armedbear/abcl/pull/54>.

File:

• trunk/abcl/src/org/armedbear/lisp/clos.lisp (modified) (2 diffs)

trunk/abcl/src/org/armedbear/lisp/clos.lisp

@@ -2191 +2191 @@
       (clrhash *reinitialize-instance-initargs-cache*))
     (if gf
-        (check-method-lambda-list name method-lambda-list
-                                  (generic-function-lambda-list gf))
+  (restart-case
+      (check-method-lambda-list name method-lambda-list
+              (generic-function-lambda-list gf))
+    (unbind-and-try-again () :report (lambda(s) (format s "Undefine generic function #'~a and continue" name))
+      (fmakunbound name)
+      (setf gf (ensure-generic-function name :lambda-list method-lambda-list))))
         (setf gf (ensure-generic-function name :lambda-list method-lambda-list)))
     (let ((method
@@ -4550 +4554 @@
                  (autoload-ref-p (second function-name))))
         (fmakunbound function-name)
-        (error 'program-error
-               :format-control "~A already names an ordinary function, macro, or special operator."
-               :format-arguments (list function-name))))
+  (progn
+    (cerror "Redefine as generic function" "~A already names an ordinary function, macro, or special operator." function-name)
+    (fmakunbound function-name)
+    )))
   (apply (if (eq generic-function-class +the-standard-generic-function-class+)
              #'make-instance-standard-generic-function