Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv19419

Modified Files: loop.lisp Log Message: Loop macro-expanders should call movitz-macroexpand etc. rather than cl:macroexpand etc.

Date: Thu Jan 15 11:41:46 2004 Author: ffjeld

Index: movitz/losp/muerte/loop.lisp diff -u movitz/losp/muerte/loop.lisp:1.1.1.1 movitz/losp/muerte/loop.lisp:1.2 --- movitz/losp/muerte/loop.lisp:1.1.1.1 Tue Jan 13 06:05:05 2004 +++ movitz/losp/muerte/loop.lisp Thu Jan 15 11:41:45 2004 @@ -244,7 +244,7 @@ (declare #+LISPM (ignore head-var user-head-var) ;use locatives, unconditionally update through the tail. ) - (setq form (macroexpand form env)) + (setq form (movitz::movitz-macroexpand form env)) (flet ((cdr-wrap (form n) (declare (fixnum n)) (do () ((<= n 4) (setq form `(,(case n @@ -772,7 +772,7 @@ (dolist (x l n) (incf n (estimate-code-size-1 x env)))))) ;;@@@@ ???? (declare (function list-size (list) fixnum)) (cond ((constantp x #+Genera env) 1) - ((symbolp x) (multiple-value-bind (new-form expanded-p) (macroexpand-1 x env) + ((symbolp x) (multiple-value-bind (new-form expanded-p) (movitz::movitz-macroexpand-1 x env) (if expanded-p (estimate-code-size-1 new-form env) 1))) ((atom x) 1) ;??? self-evaluating??? ((symbolp (car x)) @@ -808,7 +808,7 @@ ((eq fn 'return-from) (1+ (estimate-code-size-1 (third x) env))) ((or (special-operator-p fn) (member fn *estimate-code-size-punt*)) (throw 'estimate-code-size nil)) - (t (multiple-value-bind (new-form expanded-p) (macroexpand-1 x env) + (t (multiple-value-bind (new-form expanded-p) (movitz::movitz-macroexpand-1 x env) (if expanded-p (estimate-code-size-1 new-form env) (f 3)))))))) @@ -2126,7 +2126,7 @@ (and (consp x) (or (not (eq (car x) 'car)) (not (symbolp (cadr x))) - (not (symbolp (setq x (macroexpand x env))))) + (not (symbolp (setq x (movitz::movitz-macroexpand x env))))) (cons x nil))) (cdr val)) `(,val))))