X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fpcl%2Fwalk.lisp;h=39beb2e3ce4fca980fff3bc6f746d2d4fbdbea9b;hb=2217cdb364e8b48c187b085895bb2a5cbdbd9622;hp=b1bd97448733dc336f033fdaf05d58e20b5e362e;hpb=ed7ba4dad8a79726fdfeba5aa12e276ea852c540;p=sbcl.git diff --git a/src/pcl/walk.lisp b/src/pcl/walk.lisp index b1bd974..39beb2e 100644 --- a/src/pcl/walk.lisp +++ b/src/pcl/walk.lisp @@ -1,4 +1,4 @@ -;;;; a simple code walker for PCL +;;;; a simple code walker ;;;; ;;;; The code which implements the macroexpansion environment ;;;; manipulation mechanisms is in the first part of the file, the @@ -27,7 +27,11 @@ ;;;; warranty about the software, its performance or its conformity to any ;;;; specification. -(in-package "SB-WALKER") +(in-package "SB!WALKER") + +;;;; forward references + +(defvar *key-to-walker-environment*) ;;;; environment hacking stuff, necessarily SBCL-specific @@ -75,17 +79,16 @@ ;;; In SBCL, as in CMU CL before it, the environment is represented ;;; with a structure that holds alists for the functional things, -;;; variables, blocks, etc. -;;; Except for SYMBOL-MACROLET, only the SB-C::LEXENV-FUNCTIONS slot -;;; is relevant. It holds: Alist (Name . What), where What is either -;;; a functional (a local function) or a list (MACRO . ) (a -;;; local macro, with the specifier expander.) Note that Name may be a -;;; (SETF ) function. -;;; Accessors are defined below, eg (ENV-WALK-FUNCTION ENV). +;;; variables, blocks, etc. Except for SYMBOL-MACROLET, only the +;;; SB!C::LEXENV-FUNS slot is relevant. It holds: Alist (Name . What), +;;; where What is either a functional (a local function) or a list +;;; (MACRO . ) (a local macro, with the specifier expander.) +;;; Note that Name may be a (SETF ) function. Accessors are +;;; defined below, eg (ENV-WALK-FUNCTION ENV). ;;; ;;; If WITH-AUGMENTED-ENVIRONMENT is called from WALKER-ENVIRONMENT-BIND ;;; this code hides the WALKER version of an environment -;;; inside the SB-C::LEXENV structure. +;;; inside the SB!C::LEXENV structure. ;;; ;;; In CMUCL (and former SBCL), This used to be a list of lists of form ;;; ( MACRO . #) in the :functions slot @@ -97,13 +100,14 @@ ;;; Instead this list was COERCEd to a #! ;;; ;;; Instead, we now use a special sort of "function"-type for that -;;; information, because the functions slot in SB-C::LEXENV is +;;; information, because the functions slot in SB!C::LEXENV is ;;; supposed to have a list of elements. ;;; So, now we hide our bits of interest in the walker-info slot in -;;; our new BOGO-FUNCTION. +;;; our new BOGO-FUN. ;;; -;;; MACROEXPAND-1 is the only SBCL function that gets called with the -;;; constructed environment argument. +;;; MACROEXPAND-1 and SB!INT:EVAL-IN-LEXENV are the only SBCL +;;; functions that get called with the constructed environment +;;; argument. (/show "walk.lisp 108") @@ -114,31 +118,31 @@ ,macros))) ,@body)) -;;; a unique tag to show that we're the intended caller of BOGO-FUNCTION -(defvar *bogo-function-magic-tag* - '(:bogo-function-magic-tag)) +;;; a unique tag to show that we're the intended caller of BOGO-FUN +(defvar *bogo-fun-magic-tag* + '(:bogo-fun-magic-tag)) -;;; The interface of BOGO-FUNCTIONs (previously implemented as -;;; FUNCALLABLE-INSTANCES) is just these two operations, so we can -;;; do them with ordinary closures. +;;; The interface of BOGO-FUNs (previously implemented as +;;; FUNCALLABLE-INSTANCEs) is just these two operations, so we can do +;;; them with ordinary closures. ;;; -;;; KLUDGE: BOGO-FUNCTIONS are sorta weird, and MNA and I have both -;;; hacked on this code without really figuring out what they're for. -;;; (He changed them to work after some changes in the IR1 interpreter +;;; KLUDGE: BOGO-FUNs are sorta weird, and MNA and I have both hacked +;;; on this code without quite figuring out what they're for. (He +;;; changed them to work after some changes in the IR1 interpreter ;;; made functions not be built lazily, and I changed them so that ;;; they don't need FUNCALLABLE-INSTANCE stuff, so that the F-I stuff ;;; can become less general.) There may be further simplifications or ;;; clarifications which could be done. -- WHN 2001-10-19 -(defun walker-info-to-bogo-function (walker-info) +(defun walker-info-to-bogo-fun (walker-info) (lambda (magic-tag &rest rest) (aver (not rest)) ; else someone is using me in an unexpected way - (aver (eql magic-tag *bogo-function-magic-tag*)) ; else ditto + (aver (eql magic-tag *bogo-fun-magic-tag*)) ; else ditto walker-info)) -(defun bogo-function-to-walker-info (bogo-function) - (declare (type function bogo-function)) - (funcall bogo-function *bogo-function-magic-tag*)) - -(defun with-augmented-environment-internal (env functions macros) +(defun bogo-fun-to-walker-info (bogo-fun) + (declare (type function bogo-fun)) + (funcall bogo-fun *bogo-fun-magic-tag*)) + +(defun with-augmented-environment-internal (env funs macros) ;; Note: In order to record the correct function definition, we ;; would have to create an interpreted closure, but the ;; WITH-NEW-DEFINITION macro down below makes no distinction between @@ -146,35 +150,36 @@ ;; environment. So we just blow it off, 'cause anything real we do ;; would be wrong. But we still have to make an entry so we can tell ;; functions from macros. - (let ((lexenv (sb-kernel::coerce-to-lexenv env))) - (sb-c::make-lexenv - :default lexenv - :functions - (append (mapcar (lambda (f) - (cons (car f) (sb-c::make-functional :lexenv lexenv))) - functions) - (mapcar (lambda (m) - (list* (car m) - 'sb-c::macro - (if (eq (car m) *key-to-walker-environment*) - (walker-info-to-bogo-function (cadr m)) - (coerce (cadr m) 'function)))) - macros))))) + (let ((lexenv (sb!kernel::coerce-to-lexenv env))) + (sb!c::make-lexenv + :default lexenv + :funs (append (mapcar (lambda (f) + (cons (car f) + (sb!c::make-functional :lexenv lexenv))) + funs) + (mapcar (lambda (m) + (list* (car m) + 'sb!c::macro + (if (eq (car m) + *key-to-walker-environment*) + (walker-info-to-bogo-fun (cadr m)) + (coerce (cadr m) 'function)))) + macros))))) (defun environment-function (env fn) (when env - (let ((entry (assoc fn (sb-c::lexenv-functions env) :test #'equal))) + (let ((entry (assoc fn (sb!c::lexenv-funs env) :test #'equal))) (and entry - (sb-c::functional-p (cdr entry)) + (sb!c::functional-p (cdr entry)) (cdr entry))))) (defun environment-macro (env macro) (when env - (let ((entry (assoc macro (sb-c::lexenv-functions env) :test #'eq))) + (let ((entry (assoc macro (sb!c::lexenv-funs env) :test #'eq))) (and entry - (eq (cadr entry) 'sb-c::macro) + (eq (cadr entry) 'sb!c::macro) (if (eq macro *key-to-walker-environment*) - (values (bogo-function-to-walker-info (cddr entry))) + (values (bogo-fun-to-walker-info (cddr entry))) (values (function-lambda-expression (cddr entry)))))))) ;;;; other environment hacking, not so SBCL-specific as the @@ -195,15 +200,17 @@ (push (list (car mac) (convert-macro-to-lambda (cadr mac) (cddr mac) + ,old-env (string (car mac)))) ,macros)))) (with-augmented-environment (,new-env ,old-env :functions ,functions :macros ,macros) ,@body)))) -(defun convert-macro-to-lambda (llist body &optional (name "dummy macro")) +(defun convert-macro-to-lambda (llist body env &optional (name "dummy macro")) (let ((gensym (make-symbol name))) - (eval `(defmacro ,gensym ,llist ,@body)) + (eval-in-lexenv `(defmacro ,gensym ,llist ,@body) + (sb!c::make-restricted-lexenv env)) (macro-function gensym))) ;;;; the actual walker @@ -234,7 +241,7 @@ (list (list *key-to-walker-environment* (list (if wfnp walk-function (car lock)) - (if wfop walk-form (cadr lock)) + (if wfop walk-form (cadr lock)) (if decp declarations (caddr lock)) (if lexp lexical-variables (cadddr lock))))))) @@ -263,7 +270,7 @@ (defun variable-symbol-macro-p (var env) (let ((entry (member var (env-lexical-variables env) :key #'car))) - (when (eq (cadar entry) :macro) + (when (eq (cadar entry) 'sb!sys:macro) entry))) (defvar *var-declarations* '(special)) @@ -313,7 +320,7 @@ ;;; - Is a common lisp special form (not likely) ;;; - Is not a common lisp special form (on the 3600 IF --> COND). ;;; -;;; * We can safe ourselves from this case (second subcase really) +;;; * We can save ourselves from this case (second subcase really) ;;; by checking to see whether there is a template defined for ;;; something before we check to see whether we can macroexpand it. ;;; @@ -389,7 +396,7 @@ (define-walker-template unwind-protect (nil return repeat (eval))) ;;; SBCL-only special forms -(define-walker-template sb-ext:truly-the (nil quote eval)) +(define-walker-template sb!ext:truly-the (nil quote eval)) (defvar *walk-form-expand-macros-p* nil) @@ -447,7 +454,7 @@ (multiple-value-bind (newnewform macrop) (walker-environment-bind (new-env env :walk-form newform) - (macroexpand-1 newform new-env)) + (sb-xc:macroexpand-1 newform new-env)) (cond (macrop (let ((newnewnewform (walk-form-internal newnewform @@ -463,7 +470,7 @@ ;; maintained as part of SBCL, so it should know ;; about all the special forms that SBCL knows ;; about. - (error "unexpected special form ~S" fn)) + (bug "unexpected special form ~S" fn)) (t ;; Otherwise, walk the form as if it's just a ;; standard function call using a template for @@ -480,10 +487,7 @@ (set (walk-form-internal form :set env)) ((lambda call) - (cond ((or (symbolp form) - (and (listp form) - (= (length form) 2) - (eq (car form) 'setf))) + (cond ((legal-fun-name-p form) form) (t (walk-form-internal form context env))))) (case (car template) @@ -616,7 +620,7 @@ (null (get-walker-template (car form))) (progn (multiple-value-setq (new-form macrop) - (macroexpand-1 form env)) + (sb-xc:macroexpand-1 form env)) macrop)) ;; This form was a call to a macro. Maybe it expanded ;; into a declare? Recurse to find out. @@ -632,7 +636,7 @@ (defun walk-unexpected-declare (form context env) (declare (ignore context env)) - (warn "encountered DECLARE ~S in a place where a DECLARE was not expected" + (warn "encountered ~S ~_in a place where a DECLARE was not expected" form) form) @@ -811,20 +815,6 @@ walked-arglist walked-body)))) -(defun walk-named-lambda (form context old-env) - (walker-environment-bind (new-env old-env) - (let* ((name (cadr form)) - (arglist (caddr form)) - (body (cdddr form)) - (walked-arglist (walk-arglist arglist context new-env)) - (walked-body - (walk-declarations body #'walk-repeat-eval new-env))) - (relist* form - (car form) - name - walked-arglist - walked-body)))) - (defun walk-setq (form context env) (if (cdddr form) (let* ((expanded (let ((rforms nil) @@ -858,7 +848,7 @@ :lexical-variables (append (mapcar (lambda (binding) `(,(car binding) - :macro . ,(cadr binding))) + sb!sys:macro . ,(cadr binding))) bindings) (env-lexical-variables old-env))) (relist* form 'symbol-macrolet bindings