Changeset 11340

Timestamp:

10/11/08 16:15:53 (14 years ago)

Author:

ehuelsmann

Message:

Use environment for macroexpansion and get-setf-expander
instead of the null environment (which will never hold bindings).

File:

• trunk/j/src/org/armedbear/lisp/macros.lisp (modified) (3 diffs)

trunk/j/src/org/armedbear/lisp/macros.lisp

@@ -66 +66 @@
 
 ;; Adapted from SBCL.
-(defmacro push (item place)
+(defmacro push (&environment env item place)
   (if (and (symbolp place)
-     (eq place (macroexpand place)))
+     (eq place (macroexpand place env)))
       `(setq ,place (cons ,item ,place))
       (multiple-value-bind (dummies vals newval setter getter)
-        (get-setf-expansion place)
+        (get-setf-expansion place env)
         (let ((g (gensym)))
           `(let* ((,g ,item)
@@ -79 +79 @@
 
 ;; Adapted from SBCL.
-(defmacro pushnew (item place &rest keys)
+(defmacro pushnew (&environment env item place &rest keys)
   (if (and (symbolp place)
-     (eq place (macroexpand place)))
+     (eq place (macroexpand place env)))
       `(setq ,place (adjoin ,item ,place ,@keys))
       (multiple-value-bind (dummies vals newval setter getter)
-        (get-setf-expansion place)
+        (get-setf-expansion place env)
         (let ((g (gensym)))
           `(let* ((,g ,item)
@@ -92 +92 @@
 
 ;; Adapted from SBCL.
-(defmacro pop (place)
+(defmacro pop (&environment env place)
   (if (and (symbolp place)
-     (eq place (macroexpand place)))
+     (eq place (macroexpand place env)))
       `(prog1 (car ,place)
         (setq ,place (cdr ,place)))
       (multiple-value-bind (dummies vals newval setter getter)
-        (get-setf-expansion place)
+        (get-setf-expansion place env)
         (do* ((d dummies (cdr d))
               (v vals (cdr v))