- (meta-model.metadata (make-instance self)))
-
-(defun gen-supers (supers)
- (let (subclassp)
- (dolist (x supers)
- (when (member x (list-meta-models))
- (setf subclassp t)))
- (if subclassp
- supers
- (cons 'meta-model-class supers))))
-
-(defmethod %def-meta-model ((base-type t) name supers slots &rest options)
- `(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)
- `(eval-when (:compile-toplevel :load-toplevel :execute)
- (when (not (member (quote ,name) *meta-models*))
- (setf *meta-models* (cons (quote ,name) *meta-models*)))
-
- (let ((class ,(%def-meta-model (cadr (or (assoc :base-type options) '(t t))) name supers slots options)))
- class)))
-
-(defgeneric def-base-type-class-expander (base-type 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))
+ (meta-model.metadata (gethash self *meta-models*)))
+
+(defmethod meta-model.metadata ((self standard-object))
+ (meta-model.metadata (class-name (class-of self))))
+
+(eval-when (:compile-toplevel :load-toplevel :execute)
+ (defmethod make-meta-model (name supers slots options)
+ (let ((m (make-instance 'meta-model-class
+ :name name
+ :superclasses supers
+ :slots slots
+ :options options
+ ;; TODO : the metadata should inherit any superclasses
+ :metadata slots)))
+ (setf (gethash name *meta-models*) m))))
+
+(defmacro define-meta-model (name supers slots &rest options)
+ `(make-meta-model ',name ',supers ',slots ',options))
+
+(defgeneric generate-base-class-definition (base-type model name args))
+
+(defmethod generate-base-class-expander ((model t) name args)
+ (generate-base-class-definition (meta-model.base-type model) model name args))