(no commit message)

[gacela.git] / gacela_mobs.lisp

diff --git a/gacela_mobs.lisp b/gacela_mobs.lisp
index d6d420b7a301dc3a3326f403538c7c265957c21e..ccbad071b0317ffd21bc1a840cb0cbccfec196c9 100755 (executable)
--- a/gacela_mobs.lisp
+++ b/gacela_mobs.lisp
@@ -17,26 +17,18 @@
 
 ;;; World of Mob
 
-;(in-package :gacela)
+(in-package :gacela)
 
 (defmacro makemob (name &rest methods)
   `(defun ,name (&rest args &aux (option (car args)))
-     ,(cond (methods
-            (labels ((options (m &aux (option (car m)) (body (cadr m)))
-                              (cond ((null m) nil)
-                                    (t (cons (list option `(apply ,body (cdr args))) (options (cddr m)))))))
-                    (cons 'case (cons 'option (options methods))))))))
-
-(defmacro defmob (name variables &key init logic render)
-  `(let ((make-name ',(intern (concatenate 'string "MAKE-" (string name)))))
-     (setf (symbol-function make-name)
-          (makemob ,variables :init ,init :logic ,logic :render ,render))
-     make-name))
-
-;(defmacro makemob (variables &key init logic render)
-;  `(lambda
-;     ,(if (null variables) () (cons '&key variables))
-;     (mob-structure ,variables ,init ,logic ,render)))
+     ,(union
+       `(case option
+             (:on (mob-on #',name))
+             (:off (mob-off #',name)))
+       (labels ((options (m &aux (option (car m)) (body (cadr m)))
+                        (cond ((null m) nil)
+                              (t (cons (list option `(apply ,body (cdr args))) (options (cddr m)))))))
+              (options methods)))))
 
 (defmacro mob-structure (variables init logic render)
   `(list