Renamed fill-gaps-only to fill-gaps-only-p, and added the :fill-gaps-only-p initarg...

[clinton/lisp-on-lines.git] / src / meta-model.lisp

diff --git a/src/meta-model.lisp b/src/meta-model.lisp
index 58b3fd4..2fbe4b5 100644 (file)
--- a/src/meta-model.lisp
+++ b/src/meta-model.lisp
@@ -32,13 +32,14 @@
        (cons 'meta-model-class supers))))
 
 (defmethod %def-meta-model ((base-type t) name supers slots &rest options)
-  `(defclass ,name ,(gen-supers supers)
-     ()
-     (:default-initargs :metadata ',slots :base-type ,base-type)))
+  `(eval-when (:compile-toplevel :load-toplevel :execute)
+    (defclass ,name ,(gen-supers supers)
+      ()
+      (:default-initargs :metadata ',slots :base-type ,base-type))))
   
   
 (defmacro def-meta-model (name supers slots &rest options)
-  `(progn
+  `(eval-when (:compile-toplevel :load-toplevel :execute)
      (when (not (member (quote ,name) *meta-models*))
        (setf *meta-models* (cons (quote ,name) *meta-models*)))
 
@@ -50,20 +51,13 @@
 (defmethod def-base-class-expander ((model t) name args)
   (def-base-type-class-expander (meta-model.base-type model) model name args))
 
-(defmacro def-base-class (name (model) &rest args)
-  (let ((i (make-instance model)))
-    `(prog1
-         (eval ,(def-base-class-expander i name args))
-       (defmethod meta-model.metadata ((m ,name))
-        ',(meta-model.metadata i)))))
-  
-
 (defmethod base-class-name ((model t))
   (class-name (class-of (meta-model.instance model))))
-  
-
 
 (defmethod view-class-metadata ((model t))
+  "
+This is what meta-model.metadata used to be called,
+most of the below functions expect this method to exist"
   (meta-model.metadata model))
 
 (defun list-item-helper (type view &key (ret-fun #'car))