Changeset 11725

Timestamp:

04/03/09 21:17:53 (14 years ago)

Author:

ehuelsmann

Message:

Code audited for the use of MACROEXPAND without an environment.
Also, it turns out the precompiler used to work around the previously fixed issue in
RESTART-CASE by special-casing its expansion. Remove that special casing.

File:

• trunk/abcl/src/org/armedbear/lisp/precompiler.lisp (modified) (9 diffs)

trunk/abcl/src/org/armedbear/lisp/precompiler.lisp

@@ -422 +422 @@
 (defun precompile-dolist (form)
   (if *in-jvm-compile*
-      (precompile1 (macroexpand form))
+      (precompile1 (macroexpand form *compile-file-environment*))
       (cons 'DOLIST (cons (mapcar #'precompile1 (cadr form))
                           (mapcar #'precompile1 (cddr form))))))
@@ -428 +428 @@
 (defun precompile-dotimes (form)
   (if *in-jvm-compile*
-      (precompile1 (macroexpand form))
+      (precompile1 (macroexpand form *compile-file-environment*))
       (cons 'DOTIMES (cons (mapcar #'precompile1 (cadr form))
                            (mapcar #'precompile1 (cddr form))))))
@@ -464 +464 @@
 (defun precompile-do/do* (form)
   (if *in-jvm-compile*
-      (precompile1 (macroexpand form))
+      (precompile1 (macroexpand form *compile-file-environment*))
       (list* (car form)
              (precompile-do/do*-vars (cadr form))
@@ -646 +646 @@
         (parse-body (cddr form) nil)
       `(locally ,@decls ,@(mapcar #'precompile1 body)))))
-
-;; "If the restartable-form is a list whose car is any of the symbols SIGNAL,
-;; ERROR, CERROR, or WARN (or is a macro form which macroexpands into such a
-;; list), then WITH-CONDITION-RESTARTS is used implicitly to associate the
-;; indicated restarts with the condition to be signaled." So we need to
-;; precompile the restartable form before macroexpanding RESTART-CASE.
-(defun precompile-restart-case (form)
-  (let ((new-form (list* 'RESTART-CASE (precompile1 (cadr form)) (cddr form))))
-    (precompile1 (macroexpand new-form sys:*compile-file-environment*))))
 
 (defun precompile-symbol-macrolet (form)
@@ -747 +738 @@
 (defun precompile-case (form)
   (if *in-jvm-compile*
-      (precompile1 (macroexpand form))
+      (precompile1 (macroexpand form *compile-file-environment*))
       (let* ((keyform (cadr form))
              (clauses (cddr form))
@@ -762 +753 @@
 (defun precompile-cond (form)
   (if *in-jvm-compile*
-      (precompile1 (macroexpand form))
+      (precompile1 (macroexpand form *compile-file-environment*))
       (let ((clauses (cdr form))
             (result nil))
@@ -867 +858 @@
 (defun precompile-when (form)
   (if *in-jvm-compile*
-      (precompile1 (macroexpand form))
+      (precompile1 (macroexpand form *compile-file-environment*))
       (precompile-cons form)))
 
 (defun precompile-unless (form)
   (if *in-jvm-compile*
-      (precompile1 (macroexpand form))
+      (precompile1 (macroexpand form *compile-file-environment*))
       (precompile-cons form)))
 
@@ -891 +882 @@
 (defun precompile-nth-value (form)
   (if *in-jvm-compile*
-      (precompile1 (macroexpand form))
+      (precompile1 (macroexpand form *compile-file-environment*))
       form))
 
 (defun precompile-return (form)
   (if *in-jvm-compile*
-      (precompile1 (macroexpand form))
+      (precompile1 (macroexpand form *compile-file-environment*))
       (list 'RETURN (precompile1 (cadr form)))))
 
@@ -982 +973 @@
                               PSETF
                               PSETQ
-                              RESTART-CASE
                               RETURN
                               RETURN-FROM