From b72391abab0319cf4abd2db441a47ea41ce93a67 Mon Sep 17 00:00:00 2001 From: =?utf8?q?David=20V=C3=A1zquez?= Date: Sat, 31 Aug 2013 01:37:42 +0200 Subject: [PATCH] Reorder file loading and fix define-setf-expander --- jscl.lisp | 7 ++++--- src/boot.lisp | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/jscl.lisp b/jscl.lisp index 127fd02..8378417 100644 --- a/jscl.lisp +++ b/jscl.lisp @@ -47,10 +47,11 @@ ("sequence" :target) ("stream" :target) ("print" :target) - ("package" :target) - ("misc" :target) ("documentation" :target) - ("ffi" :both) + ("misc" :target) + ("ffi" :target) + ("package" :target) + ("read" :both) ("defstruct" :both) ("lambda-list" :both) diff --git a/src/boot.lisp b/src/boot.lisp index 8764aa2..821c482 100644 --- a/src/boot.lisp +++ b/src/boot.lisp @@ -369,9 +369,10 @@ (defmacro define-setf-expander (access-fn lambda-list &body body) (unless (symbolp access-fn) (error "ACCESS-FN `~S' must be a symbol." access-fn)) - `(progn (push (cons ',access-fn (lambda ,lambda-list ,@body)) - *setf-expanders*) - ',access-fn)) + `(eval-when (:compile-toplevel :load-toplevel :execute) + (push (cons ',access-fn (lambda ,lambda-list ,@body)) + *setf-expanders*) + ',access-fn)) (defmacro setf (&rest pairs) (cond -- 1.7.10.4