[Sbcl-commits] CVS: sbcl/tests clos.impure-cload.lisp,1.13,1.14

[Christophe R. <cr...@us...>]

Update of /cvsroot/sbcl/sbcl/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7083/tests

Modified Files:
	clos.impure-cload.lisp 
Log Message:
0.8.18.4:
	Pass defaulted initargs, not just present initargs, to methods
	on SHARED-INITIALIZE and INITIALIZE-INSTANCE in ctor.lisp
	... test, both for constant and variable initforms;
	... I wish I could remember who reported this bug where.


Index: clos.impure-cload.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/tests/clos.impure-cload.lisp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- clos.impure-cload.lisp	31 Dec 2004 08:25:06 -0000	1.13
+++ clos.impure-cload.lisp	31 Dec 2004 11:50:56 -0000	1.14
@@ -129,6 +129,25 @@
     (ignore-errors (make-instance 'invalid-default-initargs :foo 1))
   (assert (null result))
   (assert (typep condition 'program-error)))
+;;; :DEFAULT-INITARGS not passed to INITIALIZE-INSTANCE or
+;;; SHARED-INITIALIZE :BEFORE methods.
+(defclass default-initargs-with-method ()
+  ((foo :initarg :valid-initarg))
+  (:default-initargs :valid-initarg 2))
+(defmethod shared-initialize :before ((thing default-initargs-with-method)
+				      slot-names &key valid-initarg)
+  (assert (= valid-initarg 2)))
+(make-instance 'default-initargs-with-method)
+;;; and a test with a non-constant initarg
+(defvar *d-i-w-m-2* 0)
+(defclass default-initargs-with-method2 ()
+  ((foo :initarg :valid-initarg))
+  (:default-initargs :valid-initarg (incf *d-i-w-m-2*)))
+(defmethod shared-initialize :before ((thing default-initargs-with-method2)
+				      slot-names &key valid-initarg)
+  (assert (= valid-initarg 1)))
+(make-instance 'default-initargs-with-method2)
+(assert (= *d-i-w-m-2* 1))
 
 ;;; from Axel Schairer on cmucl-imp 2004-08-05
 (defclass class-with-symbol-initarg ()