X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fcode%2Feval.lisp;h=b33ca523492a03d9cb1c48842ee869b5c0106047;hb=dc33d6a6b84f8338e603759cec8e25da29055d50;hp=9a3cdf1c336dbd7c44241528365418046c15fd1a;hpb=ff92598854bf7cae8d57fe49cef4d9a98e1ab345;p=sbcl.git

diff --git a/src/code/eval.lisp b/src/code/eval.lisp
index 9a3cdf1..b33ca52 100644
--- a/src/code/eval.lisp
+++ b/src/code/eval.lisp
@@ -20,7 +20,7 @@
   ;; to be careful about not muffling warnings arising from inner
   ;; evaluations/compilations, though [e.g. the ignored variable in
   ;; (DEFUN FOO (X) 1)].  -- CSR, 2003-05-13
-  (let ((fun (sb!c:compile-in-lexenv (gensym "EVAL-TMPFUN-")
+  (let ((fun (sb!c:compile-in-lexenv nil
 				     `(lambda () ,expr)
 				     lexenv)))
     (funcall fun)))
@@ -70,7 +70,7 @@
              (sb!c::process-decls decls
                                   vars
                                   nil
-                                  lexenv))))
+                                  :lexenv lexenv))))
       (eval-progn-body body lexenv))))
 
 (defun eval (original-exp)
@@ -94,9 +94,9 @@
 	      (progn
 		(signal c)
 		nil)
-	      ;; ... if we're not in the compiler, better signal a
-	      ;; program error straight away.
-	      (invoke-restart 'sb!c::signal-program-error)))))
+	      ;; ... if we're not in the compiler, better signal the
+	      ;; error straight away.
+	      (invoke-restart 'sb!c::signal-error)))))
     (let ((exp (macroexpand original-exp lexenv)))
       (typecase exp
 	(symbol
@@ -128,7 +128,7 @@
 		(if (and (legal-fun-name-p name)
 			 (not (consp (let ((sb!c:*lexenv* lexenv))
 				       (sb!c:lexenv-find name funs)))))
-		    (fdefinition name)
+		    (%coerce-name-to-fun name)
 		    (%eval original-exp lexenv))))
 	     ((quote)
 	      (unless (= n-args 1)
@@ -144,8 +144,8 @@
 			 ((null (cddr args))
 			  ;; We duplicate the call to SET so that the
 			  ;; correct value gets returned.
-			  (set (first args) (eval (second args))))
-		       (set (first args) (eval (second args)))))
+			  (set (first args) (eval-in-lexenv (second args) lexenv)))
+		       (set (first args) (eval-in-lexenv (second args) lexenv))))
 		  (let ((symbol (first name)))
 		    (case (info :variable :kind symbol)
 		      (:special)
@@ -245,6 +245,7 @@
 (defun values (&rest values)
   #!+sb-doc
   "Return all arguments, in order, as values."
+  (declare (dynamic-extent values))
   (values-list values))
 
 (defun values-list (list)