X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fpcl%2Fctor.lisp;h=6ef538662feda23224bd756c223fb49b2380818e;hb=28dcf682ef2a3c80b7bcdda00787dbb5e3893abe;hp=07d6069e185f983279d3ea8036c6034b83c06a17;hpb=039f48e07f16b55080c423872c3087928e1ff7a1;p=sbcl.git

diff --git a/src/pcl/ctor.lisp b/src/pcl/ctor.lisp
index 07d6069..6ef5386 100644
--- a/src/pcl/ctor.lisp
+++ b/src/pcl/ctor.lisp
@@ -62,6 +62,14 @@
 ;;; Utilities  *******
 ;;; ******************
 
+(defun quote-plist-keys (plist)
+  (loop for (key . more) on plist by #'cddr
+	if (null more) do
+	  (error "Not a property list: ~S" plist)
+	else
+	  collect `(quote ,key)
+	  and collect (car more)))
+
 (defun plist-keys (plist &key test)
   (loop for (key . more) on plist by #'cddr
 	if (null more) do
@@ -406,9 +414,11 @@
 	    (slot-inits (slot-init-forms ctor (or ii-before si-before))))
 	(values
 	 `(let (,@(when (or ii-before ii-after)
-	           `((.ii-args. (list .instance. ,@initargs))))
+	           `((.ii-args.
+		      (list .instance. ,@(quote-plist-keys initargs)))))
 	        ,@(when (or si-before si-after)
-		   `((.si-args. (list .instance. t ,@initargs)))))
+		   `((.si-args.
+		      (list .instance. t ,@(quote-plist-keys initargs))))))
 	    ,@(loop for method in ii-before
 		    collect `(invoke-method ,method .ii-args.))
 	    ,@(loop for method in si-before