[Sbcl-commits] CVS: sbcl/src/pcl boot.lisp,1.74,1.75 vector.lisp,1.27,1.28

[William H. N. <wn...@us...>]

Update of /cvsroot/sbcl/sbcl/src/pcl
In directory sc8-pr-cvs1:/tmp/cvs-serv16758/src/pcl

Modified Files:
	boot.lisp vector.lisp 
Log Message:
0.8.3.3:
	revised PARSE-BODY to eliminate bogus style-warning for 
		(MACROLET (...) (DECLAIM ...))
	Since there are now two optional flags, use &KEY args instead 
		of trying to remember the position of &OPTIONAL args.
	code-sharing in PROG and PROG*
	'Twas passing strange passing ENV as the second argument
		to PARSE-BODY in ADD-METHOD-DECLARATIONS...
	new old BUGS (dunno why I discovered both on the same day)



Index: boot.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/pcl/boot.lisp,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- boot.lisp	20 Jul 2003 08:23:18 -0000	1.74
+++ boot.lisp	26 Aug 2003 13:21:18 -0000	1.75
@@ -499,11 +499,12 @@
 				 env))))
 
 (defun add-method-declarations (name qualifiers lambda-list body env)
+  (declare (ignore env))
   (multiple-value-bind (parameters unspecialized-lambda-list specializers)
       (parse-specialized-lambda-list lambda-list)
     (declare (ignore parameters))
     (multiple-value-bind (real-body declarations documentation)
-	(parse-body body env)
+	(parse-body body)
       (values `(lambda ,unspecialized-lambda-list
 		 ,@(when documentation `(,documentation))
 		 ;; (Old PCL code used a somewhat different style of
@@ -635,7 +636,7 @@
 	    is not a lambda form."
 	   method-lambda))
   (multiple-value-bind (real-body declarations documentation)
-      (parse-body (cddr method-lambda) env)
+      (parse-body (cddr method-lambda))
     (let* ((name-decl (get-declaration '%method-name declarations))
 	   (sll-decl (get-declaration '%method-lambda-list declarations))
 	   (method-name (when (consp name-decl) (car name-decl)))
@@ -725,7 +726,7 @@
 	    (multiple-value-bind (walked-lambda-body
 				  walked-declarations
 				  walked-documentation)
-		(parse-body (cddr walked-lambda) env)
+		(parse-body (cddr walked-lambda))
 	      (declare (ignore walked-documentation))
 	      (when (or next-method-p-p call-next-method-p)
 		(setq plist (list* :needs-next-methods-p t plist)))

Index: vector.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/pcl/vector.lisp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- vector.lisp	9 Jun 2003 16:21:18 -0000	1.27
+++ vector.lisp	26 Aug 2003 13:21:19 -0000	1.28
@@ -1013,8 +1013,8 @@
 ;;; body given, or return NIL if no %METHOD-NAME declaration is found.
 (defun body-method-name (body)
   (multiple-value-bind (real-body declarations documentation)
-      (parse-body body nil)
-    (declare (ignore documentation real-body))
+      (parse-body body)
+    (declare (ignore real-body documentation))
     (let ((name-decl (get-declaration '%method-name declarations)))
       (and name-decl
 	   (destructuring-bind (name) name-decl