X-Git-Url: https://git.hcoop.net/clinton/lisp-on-lines.git/blobdiff_plain/9d6c69fb50810bef64e6f3357a21b4f4397e2b1b..44108fd67c22992f320e2ea2424bab38a6547473:/src/meta-model.lisp?ds=sidebyside

diff --git a/src/meta-model.lisp b/src/meta-model.lisp
index a0c842a..4416423 100644
--- a/src/meta-model.lisp
+++ b/src/meta-model.lisp
@@ -22,6 +22,9 @@
 (defmethod meta-model.metadata ((self (eql nil)))
   nil)
 
+(defmethod meta-model.metadata ((self symbol))
+  (meta-model.metadata (make-instance self)))
+
 (defun gen-supers (supers)
   (let (subclassp)
     (dolist (x supers)
@@ -32,13 +35,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 +54,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))
@@ -105,7 +102,7 @@
 	      (list-item-helper
 	       type view
 	       :ret-fun #'rfun)))
-    (append (lister :key) (lister :base))))
+    (append (lister :key) (lister :base) (lister nil))))
 			 
 (defmethod slot-type ((view t) slot)
   "returns the CLSQL type of SLOT"
@@ -165,7 +162,8 @@
     (when (equal (getf (cdr s) :home-key) slot)
       (let ((val (slot-value model (car s))))
       (return-from explode-foreign-key 
-	(values (if val val (make-instance (getf (cdr s) :join-class))) (getf (cdr s) :foreign-key)))))))
+	(values (if val val (make-instance (getf (cdr s) :join-class))) 
+		(getf (cdr s) :foreign-key)))))))
 
 (defun find-join-helper (foreign-key)
   (lambda (class slot) 
@@ -217,14 +215,18 @@
 (defgeneric select-instances (instance &rest args)
   (:documentation "Select instances in backend dependent way"))
 
+(defgeneric prepare-slot-name-for-select (instance slot-name)
+  (:method (i s) s))
+
 (defmacro def-compare-expr (instance-type name expr &key value-format)
   `(defmethod ,name ((instance ,instance-type) slot-name value)
      (declare (ignore instance))
-     (,expr slot-name ,(typecase value-format
+     (,expr (prepare-slot-name-for-select instance slot-name) ,(typecase value-format
                                  (null 'value)
                                  (string `(format nil ,value-format value))
                                  (t `(,value-format value))))))
 
+
 (defmacro def-logical-expr (instance-type name expr)
   `(defmethod ,name ((instance ,instance-type) &rest args)
      (declare (ignore instance))