X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fir1tran.lisp;h=c5f7b4184d7edb1aa2a1f78b9a0697486ff09a09;hb=f422a2ce49eb30a01ce71935eaadeb92badc41a4;hp=23405d4f25e1e2954a3b6922d809a5e0db0f39cd;hpb=ec735ab75335c1744b39190314142a7e6f1ecdb3;p=sbcl.git

diff --git a/src/compiler/ir1tran.lisp b/src/compiler/ir1tran.lisp
index 23405d4..c5f7b41 100644
--- a/src/compiler/ir1tran.lisp
+++ b/src/compiler/ir1tran.lisp
@@ -903,7 +903,7 @@
   (declare (list decl vars) (type lexenv res))
   (let ((type (compiler-specifier-type (first decl))))
     (collect ((restr nil cons)
-	      (new-vars nil cons))
+             (new-vars nil cons))
       (dolist (var-name (rest decl))
 	(let* ((bound-var (find-in-bindings vars var-name))
 	       (var (or bound-var
@@ -911,26 +911,31 @@
 			(find-free-var var-name))))
 	  (etypecase var
 	    (leaf
-	     (let* ((old-type (or (lexenv-find var type-restrictions)
-				  (leaf-type var)))
-		    (int (if (or (fun-type-p type)
-				 (fun-type-p old-type))
-			     type
-			     (type-approx-intersection2 old-type type))))
-	       (cond ((eq int *empty-type*)
-		      (unless (policy *lexenv* (= inhibit-warnings 3))
-			(compiler-warn
-			 "The type declarations ~S and ~S for ~S conflict."
-			 (type-specifier old-type) (type-specifier type)
-			 var-name)))
-		     (bound-var (setf (leaf-type bound-var) int))
-		     (t
-		      (restr (cons var int))))))
+             (flet ((process-var (var bound-var)
+                      (let* ((old-type (or (lexenv-find var type-restrictions)
+                                           (leaf-type var)))
+                             (int (if (or (fun-type-p type)
+                                          (fun-type-p old-type))
+                                      type
+                                      (type-approx-intersection2 old-type type))))
+                        (cond ((eq int *empty-type*)
+                               (unless (policy *lexenv* (= inhibit-warnings 3))
+                                 (compiler-warn
+                                  "The type declarations ~S and ~S for ~S conflict."
+                                  (type-specifier old-type) (type-specifier type)
+                                  var-name)))
+                              (bound-var (setf (leaf-type bound-var) int))
+                              (t
+                               (restr (cons var int)))))))
+               (process-var var bound-var)
+               (awhen (and (lambda-var-p var)
+                           (lambda-var-specvar var))
+                      (process-var it nil))))
 	    (cons
 	     ;; FIXME: non-ANSI weirdness
 	     (aver (eq (car var) 'MACRO))
 	     (new-vars `(,var-name . (MACRO . (the ,(first decl)
-						   ,(cdr var))))))
+                                                ,(cdr var))))))
 	    (heap-alien-info
 	     (compiler-error
 	      "~S is an alien variable, so its type can't be declared."
@@ -1437,7 +1442,8 @@
 				aux-vals
 				result
 				(source-name '.anonymous.)
-				debug-name)
+				debug-name
+                                (note-lexical-bindings t))
   (declare (list body vars aux-vars aux-vals)
 	   (type (or continuation null) result))
 
@@ -1473,7 +1479,8 @@
 		 (svars var)
 		 (new-venv (cons (leaf-source-name specvar) specvar)))
 		(t
-		 (note-lexical-binding (leaf-source-name var))
+                 (when note-lexical-bindings
+                   (note-lexical-binding (leaf-source-name var)))
 		 (new-venv (cons (leaf-source-name var) var))))))
 
       (let ((*lexenv* (make-lexenv :vars (new-venv)
@@ -1481,7 +1488,7 @@
 				   :cleanup nil)))
 	(setf (bind-lambda bind) lambda)
 	(setf (node-lexenv bind) *lexenv*)
-	
+
 	(let ((cont1 (make-continuation))
 	      (cont2 (make-continuation)))
 	  (continuation-starts-block cont1)
@@ -1522,19 +1529,27 @@
   (declare (type clambda fun) (list vars vals defaults))
   (let* ((fvars (reverse vars))
 	 (arg-vars (mapcar (lambda (var)
-			     (unless (lambda-var-specvar var)
-			       (note-lexical-binding (leaf-source-name var)))
 			     (make-lambda-var
 			      :%source-name (leaf-source-name var)
 			      :type (leaf-type var)
 			      :where-from (leaf-where-from var)
 			      :specvar (lambda-var-specvar var)))
 			   fvars))
-	 (fun (ir1-convert-lambda-body `((%funcall ,fun
-						   ,@(reverse vals)
-						   ,@defaults))
-				       arg-vars
-				       :debug-name "&OPTIONAL processor")))
+	 (fun (collect ((default-bindings)
+                        (default-vals))
+                (dolist (default defaults)
+                  (if (constantp default)
+                      (default-vals default)
+                      (let ((var (gensym)))
+                        (default-bindings `(,var ,default))
+                        (default-vals var))))
+                (ir1-convert-lambda-body `((let (,@(default-bindings))
+                                             (%funcall ,fun
+                                                       ,@(reverse vals)
+                                                       ,@(default-vals))))
+                                         arg-vars
+                                         :debug-name "&OPTIONAL processor"
+                                         :note-lexical-bindings nil))))
     (mapc (lambda (var arg-var)
 	    (when (cdr (leaf-refs arg-var))
 	      (setf (leaf-ever-used var) t)))
@@ -1703,9 +1718,10 @@
 		 `((let ,(temps)
 		     ,@(body)
 		     (%funcall ,(optional-dispatch-main-entry res)
-			       . ,(arg-vals)))) ; FIXME: What is the '.'? ,@?
+			       ,@(arg-vals))))
 		 (arg-vars)
-		 :debug-name (debug-namify "~S processing" '&more))))
+		 :debug-name (debug-namify "~S processing" '&more)
+                 :note-lexical-bindings nil)))
 	(setf (optional-dispatch-more-entry res) ep))))
 
   (values))