(in-package "SB!IMPL")
+(defparameter *eval-calls* 0)
+
+(defun !eval-cold-init ()
+ (setf *eval-calls* 0
+ *evaluator-mode* :compile)
+ #!+sb-eval
+ (setf sb!eval::*eval-level* -1
+ sb!eval::*eval-verbose* nil))
+
+(defvar *eval-source-context* nil)
+
;;; general case of EVAL (except in that it can't handle toplevel
;;; EVAL-WHEN magic properly): Delegate to #'COMPILE.
(defun %simple-eval (expr lexenv)
;; 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
+ ;;
+ ;; As of 1.0.21.6 we muffle compiler notes lexically here, which seems
+ ;; always safe. --NS
(let* (;; why PROGN? So that attempts to eval free declarations
;; signal errors rather than return NIL. -- CSR, 2007-05-01
- (lambda `(lambda () (progn ,expr)))
+ (lambda `(named-lambda (eval ,(sb!c::source-form-context *eval-source-context*)) ()
+ (declare (muffle-conditions compiler-note))
+ (progn ,expr)))
(fun (sb!c:compile-in-lexenv nil lambda lexenv)))
(funcall fun)))
(defun simple-eval-in-lexenv (original-exp lexenv)
(declare (optimize (safety 1)))
;; (aver (lexenv-simple-p lexenv))
+ (incf *eval-calls*)
(handler-bind
((sb!c:compiler-error
(lambda (c)
(typecase exp
(symbol
(ecase (info :variable :kind exp)
- (:constant
- (values (info :variable :constant-value exp)))
- ((:special :global)
+ ((:special :global :constant :unknown)
(symbol-value exp))
;; FIXME: This special case here is a symptom of non-ANSI
;; weirdness in SBCL's ALIEN implementation, which could
(not (consp (let ((sb!c:*lexenv* lexenv))
(sb!c:lexenv-find name funs)))))
(%coerce-name-to-fun name)
- (%simple-eval original-exp lexenv))))
+ ;; FIXME: This is a bit wasteful: it would be nice to call
+ ;; COMPILE-IN-LEXENV with the lambda-form directly, but
+ ;; getting consistent source context and muffling compiler notes
+ ;; is easier this way.
+ (%simple-eval original-exp lexenv))))
((quote)
(unless (= n-args 1)
(error "wrong number of args to QUOTE:~% ~S" exp))
;; PROGN; otherwise, the EVAL-WHEN form returns NIL.
(declare (ignore ct lt))
(when e
- (simple-eval-progn-body body lexenv)))))
+ (simple-eval-progn-body body lexenv)))))
((locally)
- (simple-eval-locally exp lexenv))
+ (simple-eval-locally exp lexenv))
((macrolet)
(destructuring-bind (definitions &rest body)
(rest exp)
(declare (ignore funs))
sb!c:*lexenv*)
:eval))))
- (simple-eval-locally `(locally ,@body) lexenv))))
+ (simple-eval-locally `(locally ,@body) lexenv))))
((symbol-macrolet)
(destructuring-bind (definitions &rest body) (rest exp)
(multiple-value-bind (lexenv vars)
#!+sb-doc
"Evaluate the argument in a null lexical environment, returning the
result or results."
- (eval-in-lexenv original-exp (make-null-lexenv)))
+ (let ((*eval-source-context* original-exp))
+ (eval-in-lexenv original-exp (make-null-lexenv))))
\f
;;; miscellaneous full function definitions of things which are
(defun values (&rest values)
#!+sb-doc
"Return all arguments, in order, as values."
- (declare (dynamic-extent values))
+ (declare (truly-dynamic-extent values))
(values-list values))
(defun values-list (list)