0.7.1.24:

[sbcl.git] / tests / clos.impure.lisp

diff --git a/tests/clos.impure.lisp b/tests/clos.impure.lisp
index 295e360..9d43e31 100644 (file)
--- a/tests/clos.impure.lisp
+++ b/tests/clos.impure.lisp
@@ -15,8 +15,8 @@
   (:use "CL"))
 (in-package "FOO")
 \f
-;;;; It should be possible to do DEFGENERIC and DEFMETHOD referring to
-;;;; structure types defined earlier in the file.
+;;; It should be possible to do DEFGENERIC and DEFMETHOD referring to
+;;; structure types defined earlier in the file.
 (defstruct struct-a x y)
 (defstruct struct-b x y z)
 (defmethod wiggle ((a struct-a))
@@ -51,7 +51,32 @@
 ;;; bug reported and fixed by Alexey Dejneka sbcl-devel 2001-09-10:
 ;;; This DEFGENERIC shouldn't cause an error.
 (defgeneric ad-gf (a) (:method :around (x) x))
-\f
+
+;;; DEFGENERIC and DEFMETHOD shouldn't accept &REST when it's not
+;;; followed by a variable:
+;;; e.g. (DEFMETHOD FOO ((X T) &REST) NIL) should signal an error.
+(eval-when (:load-toplevel :compile-toplevel :execute)
+  (defmacro expect-error (&body body)
+    `(multiple-value-bind (res condition)
+      (ignore-errors (progn ,@body))
+      (declare (ignore res))
+      (typep condition 'error))))
+
+(assert (expect-error
+         (macroexpand-1
+          '(defmethod foo0 ((x t) &rest) nil))))
+
+(assert (expect-error (defgeneric foo1 (x &rest))))
+(assert (expect-error (defgeneric foo2 (x a &rest))))
+
+(defgeneric foo3 (x &rest y))
+(defmethod foo3 ((x t) &rest y) nil)
+(defmethod foo4 ((x t) &key y &rest z) nil)
+(defgeneric foo4 (x &key y &rest z))
+
+(assert (expect-error (defgeneric foo5 (x &rest))))
+(assert (expect-error (macroexpand-1 '(defmethod foo6 (x &rest)))))
+
 ;;; structure-class tests setup
 (defclass structure-class-foo1 () () (:metaclass cl:structure-class))
 (defclass structure-class-foo2 (structure-class-foo1)
@@ -66,6 +91,29 @@
                'structure-class))
 (assert (typep (make-instance 'structure-class-foo1) 'structure-class-foo1))
 (assert (typep (make-instance 'standard-class-foo1) 'standard-class-foo1))
+
+;;; DEFGENERIC's blow-away-old-methods behavior is specified to have
+;;; special hacks to distinguish between defined-with-DEFGENERIC-:METHOD
+;;; methods and defined-with-DEFMETHOD methods, so that reLOADing
+;;; DEFGENERIC-containing files does the right thing instead of 
+;;; randomly slicing your generic functions. (APD made this work
+;;; in sbcl-0.7.0.2.)
+(defgeneric born-to-be-redefined (x)
+  (:method ((x integer))
+    'integer))
+(defmethod born-to-be-redefined ((x real))
+  'real)
+(assert (eq (born-to-be-redefined 1) 'integer))
+(defgeneric born-to-be-redefined (x))
+(assert (eq (born-to-be-redefined 1) 'real)) ; failed until sbcl-0.7.0.2
+(defgeneric born-to-be-redefined (x)
+  (:method ((x integer))
+    'integer))
+(defmethod born-to-be-redefined ((x integer))
+  'int)
+(assert (eq (born-to-be-redefined 1) 'int))
+(defgeneric born-to-be-redefined (x))
+(assert (eq (born-to-be-redefined 1) 'int))
 \f
 ;;;; success