Commit 4f0baec1 authored by Peter Hildebrandt's avatar Peter Hildebrandt
Browse files

sbcl fixes (forward declaration of reader methods, eval-when)

parent c165c14d
......@@ -46,7 +46,9 @@ See the Lisp Lesser GNU Public License for more details.
`(eval-when (:compile-toplevel :execute :load-toplevel)
(unless (macro-function ',deriver-fn)
(defmacro ,deriver-fn ()
`(,',reader-fn self))))))))))
`(,',reader-fn self)))
#+sbcl (unless (fboundp ',reader-fn)
(defgeneric ,reader-fn (slot))))))))))
;
; ------- defclass --------------- (^slot-value ,model ',',slotname)
......@@ -98,9 +100,8 @@ the defmodel form for ~a" ',class ',class))))
(let* ((reader-fn (or reader accessor))
(writer-fn (or writer accessor))
)
`(progn
`(eval-when (#+sbcl :load-toplevel :execute) ; ph -- prevent sbcl warning
(setf (md-slot-cell-type ',class ',slotname) ,cell)
,(when owning
`(setf (md-slot-owning ',class ',slotname) ,owning))
,(when reader-fn
......
......@@ -23,7 +23,7 @@ See the Lisp Lesser GNU Public License for more details.
(eval-when (:compile-toplevel :load-toplevel :execute)
(defmacro export! (&rest symbols)
`(eval-when ( :compile-toplevel :load-toplevel :execute)
`(eval-when (:compile-toplevel :load-toplevel :execute)
(export ',symbols))))
(eval-now!
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment