X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcode%2Feval.lisp;h=6e8b10fea029a335ed0a6d4fed5e71e3fffe70a3;hb=86210c4e406c1b2ff10cc3bac0e71435867db48b;hp=1b63f276fe696b02e0709ce0181a3c044174dcf0;hpb=4eb1a6d3ad2b7dcc19ac0ec979a1eb1eb049659a;p=sbcl.git diff --git a/src/code/eval.lisp b/src/code/eval.lisp index 1b63f27..6e8b10f 100644 --- a/src/code/eval.lisp +++ b/src/code/eval.lisp @@ -55,7 +55,7 @@ (eval (first i)) (return (eval (first i)))))) -;;; Pick off a few easy cases, and the various top-level EVAL-WHEN +;;; Pick off a few easy cases, and the various top level EVAL-WHEN ;;; magical cases, and call %EVAL for the rest. (defun eval (original-exp) #!+sb-doc @@ -112,8 +112,8 @@ (set (first args) (eval (second args))))) (let ((symbol (first name))) (case (info :variable :kind symbol) - ;; FIXME: I took out the *TOP-LEVEL-AUTO-DECLARE* - ;; test here, and removed the *TOP-LEVEL-AUTO-DECLARE* + ;; FIXME: I took out the *TOPLEVEL-AUTO-DECLARE* + ;; test here, and removed the *TOPLEVEL-AUTO-DECLARE* ;; variable; the code should now act as though that ;; variable is NIL. This should be tested.. (:special) @@ -156,32 +156,6 @@ (%eval original-exp)))))) (t exp)))) - -(defun function-lambda-expression (fun) - "Return (VALUES DEFINING-LAMBDA-EXPRESSION CLOSURE-P NAME), where - DEFINING-LAMBDA-EXPRESSION is NIL if unknown, or a suitable argument - to COMPILE otherwise, CLOSURE-P is non-NIL if the function's definition - might have been enclosed in some non-null lexical environment, and - NAME is some name (for debugging only) or NIL if there is no name." - (declare (type function fun)) - (let* ((fun (%simple-fun-self fun)) - (name (%simple-fun-name fun)) - (code (sb!di::fun-code-header fun)) - (info (sb!kernel:%code-debug-info code))) - (if info - (let ((source (first (sb!c::compiled-debug-info-source info)))) - (cond ((and (eq (sb!c::debug-source-from source) :lisp) - (eq (sb!c::debug-source-info source) fun)) - (values (second (svref (sb!c::debug-source-name source) 0)) - nil name)) - ((stringp name) - (values nil t name)) - (t - (let ((exp (fun-name-inline-expansion name))) - (if exp - (values exp nil name) - (values nil t name)))))) - (values nil t name)))) ;;; miscellaneous full function definitions of things which are ;;; ordinarily handled magically by the compiler