HCoop
/
clinton
/
lisp-on-lines.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
moved display of modified record to below dialog
[clinton/lisp-on-lines.git]
/
src
/
meta-model.lisp
diff --git
a/src/meta-model.lisp
b/src/meta-model.lisp
index
58b3fd4
..
aabd2ff
100644
(file)
--- 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 (eql nil)))
nil)
+(defmethod meta-model.metadata ((self symbol))
+ (meta-model.metadata (make-instance self)))
+
(defun gen-supers (supers)
(let (subclassp)
(dolist (x supers)
(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)
(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)
(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*)))
(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))
(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 base-class-name ((model t))
(class-name (class-of (meta-model.instance model))))
-
-
(defmethod view-class-metadata ((model t))
(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))
(meta-model.metadata model))
(defun list-item-helper (type view &key (ret-fun #'car))
@@
-218,14
+215,18
@@
(defgeneric select-instances (instance &rest args)
(:documentation "Select instances in backend dependent way"))
(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))
(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))))))
(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))
(defmacro def-logical-expr (instance-type name expr)
`(defmethod ,name ((instance ,instance-type) &rest args)
(declare (ignore instance))