X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Feval.lisp;h=3e4c7295c8f32a346ea2552ad0b99b72438a4bf8;hb=4898ef32c639b1c7f4ee13a5ba566ce6debd03e6;hp=b33ca523492a03d9cb1c48842ee869b5c0106047;hpb=79cc569a97e444389350ea3f5b1017374fe16bec;p=sbcl.git diff --git a/src/code/eval.lisp b/src/code/eval.lisp index b33ca52..3e4c729 100644 --- a/src/code/eval.lisp +++ b/src/code/eval.lisp @@ -21,8 +21,8 @@ ;; evaluations/compilations, though [e.g. the ignored variable in ;; (DEFUN FOO (X) 1)]. -- CSR, 2003-05-13 (let ((fun (sb!c:compile-in-lexenv nil - `(lambda () ,expr) - lexenv))) + `(lambda () ,expr) + lexenv))) (funcall fun))) ;;; Handle PROGN and implicit PROGN. @@ -30,9 +30,9 @@ (unless (list-with-length-p progn-body) (let ((*print-circle* t)) (error 'simple-program-error - :format-control - "~@" - :format-arguments (list progn-body)))) + :format-control + "~@" + :format-arguments (list progn-body)))) ;; Note: ;; * We can't just use (MAP NIL #'EVAL PROGN-BODY) here, because we ;; need to take care to return all the values of the final EVAL. @@ -40,11 +40,11 @@ ;; gives the right result when PROGN-BODY is NIL, because ;; (FIRST NIL) = (REST NIL) = NIL. (do* ((i progn-body rest-i) - (rest-i (rest i) (rest i))) + (rest-i (rest i) (rest i))) (nil) (if rest-i ; if not last element of list - (eval-in-lexenv (first i) lexenv) - (return (eval-in-lexenv (first i) lexenv))))) + (eval-in-lexenv (first i) lexenv) + (return (eval-in-lexenv (first i) lexenv))))) (defun eval-locally (exp lexenv &key vars) (multiple-value-bind (body decls) @@ -63,9 +63,9 @@ ;; then thrown away, as it happens]). -- CSR, ;; 2002-10-24 (let* ((sb!c:*lexenv* lexenv) - (sb!c::*free-funs* (make-hash-table :test 'equal)) - (sb!c::*free-vars* (make-hash-table :test 'eq)) - (sb!c::*undefined-warnings* nil)) + (sb!c::*free-funs* (make-hash-table :test 'equal)) + (sb!c::*free-vars* (make-hash-table :test 'eq)) + (sb!c::*undefined-warnings* nil)) ;; FIXME: VALUES declaration (sb!c::process-decls decls vars @@ -86,108 +86,108 @@ ;; (aver (lexenv-simple-p lexenv)) (handler-bind ((sb!c:compiler-error - (lambda (c) - (if (boundp 'sb!c::*compiler-error-bailout*) - ;; if we're in the compiler, delegate either to a higher - ;; authority or, if that's us, back down to the - ;; outermost compiler handler... - (progn - (signal c) - nil) - ;; ... if we're not in the compiler, better signal the - ;; error straight away. - (invoke-restart 'sb!c::signal-error))))) + (lambda (c) + (if (boundp 'sb!c::*compiler-error-bailout*) + ;; if we're in the compiler, delegate either to a higher + ;; authority or, if that's us, back down to the + ;; outermost compiler handler... + (progn + (signal c) + nil) + ;; ... 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 - (ecase (info :variable :kind exp) - (:constant - (values (info :variable :constant-value exp))) - ((:special :global) - (symbol-value exp)) - ;; FIXME: This special case here is a symptom of non-ANSI - ;; weirdness in SBCL's ALIEN implementation, which could - ;; cause problems for e.g. code walkers. It'd probably be - ;; good to ANSIfy it by making alien variable accessors - ;; into ordinary forms, e.g. (SB-UNIX:ENV) and (SETF - ;; SB-UNIX:ENV), instead of magical symbols, e.g. plain - ;; SB-UNIX:ENV. Then if the old magical-symbol syntax is to - ;; be retained for compatibility, it can be implemented - ;; with DEFINE-SYMBOL-MACRO, keeping the code walkers - ;; happy. - (:alien - (%eval original-exp lexenv)))) - (list - (let ((name (first exp)) - (n-args (1- (length exp)))) - (case name - ((function) - (unless (= n-args 1) - (error "wrong number of args to FUNCTION:~% ~S" exp)) - (let ((name (second exp))) - (if (and (legal-fun-name-p name) - (not (consp (let ((sb!c:*lexenv* lexenv)) - (sb!c:lexenv-find name funs))))) - (%coerce-name-to-fun name) - (%eval original-exp lexenv)))) - ((quote) - (unless (= n-args 1) - (error "wrong number of args to QUOTE:~% ~S" exp)) - (second exp)) - (setq - (unless (evenp n-args) - (error "odd number of args to SETQ:~% ~S" exp)) - (unless (zerop n-args) - (do ((name (cdr exp) (cddr name))) - ((null name) - (do ((args (cdr exp) (cddr args))) - ((null (cddr args)) - ;; We duplicate the call to SET so that the - ;; correct value gets returned. - (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) - (t (return (%eval original-exp lexenv)))) - (unless (type= (info :variable :type symbol) - *universal-type*) - ;; let the compiler deal with type checking - (return (%eval original-exp lexenv))))))) - ((progn) - (eval-progn-body (rest exp) lexenv)) - ((eval-when) - ;; FIXME: DESTRUCTURING-BIND returns ARG-COUNT-ERROR - ;; instead of PROGRAM-ERROR when there's something wrong - ;; with the syntax here (e.g. missing SITUATIONS). This - ;; could be fixed by hand-crafting clauses to catch and - ;; report each possibility, but it would probably be - ;; cleaner to write a new macro - ;; DESTRUCTURING-BIND-PROGRAM-SYNTAX which does - ;; DESTRUCTURING-BIND and promotes any mismatch to - ;; PROGRAM-ERROR, then to use it here and in (probably - ;; dozens of) other places where the same problem - ;; arises. - (destructuring-bind (eval-when situations &rest body) exp - (declare (ignore eval-when)) - (multiple-value-bind (ct lt e) - (sb!c:parse-eval-when-situations situations) - ;; CLHS 3.8 - Special Operator EVAL-WHEN: The use of - ;; the situation :EXECUTE (or EVAL) controls whether - ;; evaluation occurs for other EVAL-WHEN forms; that - ;; is, those that are not top level forms, or those - ;; in code processed by EVAL or COMPILE. If the - ;; :EXECUTE situation is specified in such a form, - ;; then the body forms are processed as an implicit - ;; PROGN; otherwise, the EVAL-WHEN form returns NIL. - (declare (ignore ct lt)) - (when e - (eval-progn-body body lexenv))))) - ((locally) - (eval-locally exp lexenv)) - ((macrolet) - (destructuring-bind (definitions &rest body) - (rest exp) + (symbol + (ecase (info :variable :kind exp) + (:constant + (values (info :variable :constant-value exp))) + ((:special :global) + (symbol-value exp)) + ;; FIXME: This special case here is a symptom of non-ANSI + ;; weirdness in SBCL's ALIEN implementation, which could + ;; cause problems for e.g. code walkers. It'd probably be + ;; good to ANSIfy it by making alien variable accessors + ;; into ordinary forms, e.g. (SB-UNIX:ENV) and (SETF + ;; SB-UNIX:ENV), instead of magical symbols, e.g. plain + ;; SB-UNIX:ENV. Then if the old magical-symbol syntax is to + ;; be retained for compatibility, it can be implemented + ;; with DEFINE-SYMBOL-MACRO, keeping the code walkers + ;; happy. + (:alien + (%eval original-exp lexenv)))) + (list + (let ((name (first exp)) + (n-args (1- (length exp)))) + (case name + ((function) + (unless (= n-args 1) + (error "wrong number of args to FUNCTION:~% ~S" exp)) + (let ((name (second exp))) + (if (and (legal-fun-name-p name) + (not (consp (let ((sb!c:*lexenv* lexenv)) + (sb!c:lexenv-find name funs))))) + (%coerce-name-to-fun name) + (%eval original-exp lexenv)))) + ((quote) + (unless (= n-args 1) + (error "wrong number of args to QUOTE:~% ~S" exp)) + (second exp)) + (setq + (unless (evenp n-args) + (error "odd number of args to SETQ:~% ~S" exp)) + (unless (zerop n-args) + (do ((name (cdr exp) (cddr name))) + ((null name) + (do ((args (cdr exp) (cddr args))) + ((null (cddr args)) + ;; We duplicate the call to SET so that the + ;; correct value gets returned. + (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) + (t (return (%eval original-exp lexenv)))) + (unless (type= (info :variable :type symbol) + *universal-type*) + ;; let the compiler deal with type checking + (return (%eval original-exp lexenv))))))) + ((progn) + (eval-progn-body (rest exp) lexenv)) + ((eval-when) + ;; FIXME: DESTRUCTURING-BIND returns ARG-COUNT-ERROR + ;; instead of PROGRAM-ERROR when there's something wrong + ;; with the syntax here (e.g. missing SITUATIONS). This + ;; could be fixed by hand-crafting clauses to catch and + ;; report each possibility, but it would probably be + ;; cleaner to write a new macro + ;; DESTRUCTURING-BIND-PROGRAM-SYNTAX which does + ;; DESTRUCTURING-BIND and promotes any mismatch to + ;; PROGRAM-ERROR, then to use it here and in (probably + ;; dozens of) other places where the same problem + ;; arises. + (destructuring-bind (eval-when situations &rest body) exp + (declare (ignore eval-when)) + (multiple-value-bind (ct lt e) + (sb!c:parse-eval-when-situations situations) + ;; CLHS 3.8 - Special Operator EVAL-WHEN: The use of + ;; the situation :EXECUTE (or EVAL) controls whether + ;; evaluation occurs for other EVAL-WHEN forms; that + ;; is, those that are not top level forms, or those + ;; in code processed by EVAL or COMPILE. If the + ;; :EXECUTE situation is specified in such a form, + ;; then the body forms are processed as an implicit + ;; PROGN; otherwise, the EVAL-WHEN form returns NIL. + (declare (ignore ct lt)) + (when e + (eval-progn-body body lexenv))))) + ((locally) + (eval-locally exp lexenv)) + ((macrolet) + (destructuring-bind (definitions &rest body) + (rest exp) (let ((lexenv (let ((sb!c:*lexenv* lexenv)) (sb!c::funcall-in-macrolet-lexenv @@ -197,8 +197,8 @@ sb!c:*lexenv*) :eval)))) (eval-locally `(locally ,@body) lexenv)))) - ((symbol-macrolet) - (destructuring-bind (definitions &rest body) (rest exp) + ((symbol-macrolet) + (destructuring-bind (definitions &rest body) (rest exp) (multiple-value-bind (lexenv vars) (let ((sb!c:*lexenv* lexenv)) (sb!c::funcall-in-symbol-macrolet-lexenv @@ -207,16 +207,16 @@ (values sb!c:*lexenv* vars)) :eval)) (eval-locally `(locally ,@body) lexenv :vars vars)))) - (t - (if (and (symbolp name) - (eq (info :function :kind name) :function)) - (collect ((args)) + (t + (if (and (symbolp name) + (eq (info :function :kind name) :function)) + (collect ((args)) (dolist (arg (rest exp)) (args (eval-in-lexenv arg lexenv))) (apply (symbol-function name) (args))) - (%eval exp lexenv)))))) - (t - exp))))) + (%eval exp lexenv)))))) + (t + exp))))) ;;; miscellaneous full function definitions of things which are ;;; ordinarily handled magically by the compiler @@ -228,14 +228,14 @@ last argument, appended to the value of the last argument, which must be a list." (cond ((atom arguments) - (apply function arg)) - ((atom (cdr arguments)) - (apply function (cons arg (car arguments)))) - (t (do* ((a1 arguments a2) - (a2 (cdr arguments) (cdr a2))) - ((atom (cdr a2)) - (rplacd a1 (car a2)) - (apply function (cons arg arguments))))))) + (apply function arg)) + ((atom (cdr arguments)) + (apply function (cons arg (car arguments)))) + (t (do* ((a1 arguments a2) + (a2 (cdr arguments) (cdr a2))) + ((atom (cdr a2)) + (rplacd a1 (car a2)) + (apply function (cons arg arguments))))))) (defun funcall (function &rest arguments) #!+sb-doc