(no commit message)

[gacela.git] / gacela_mobs.lisp

diff --git a/gacela_mobs.lisp b/gacela_mobs.lisp
index 0cd56ae480c57e16a48ac0a7903c15d8df9c461a..ccbad071b0317ffd21bc1a840cb0cbccfec196c9 100755 (executable)
--- a/gacela_mobs.lisp
+++ b/gacela_mobs.lisp
@@ -17,29 +17,18 @@
 
 ;;; World of Mob
 
-;(in-package :gacela)
-
-(defmacro makemob (name variables &rest methods)
-  `(let ,variables
-     (defun ,name (&rest args &aux (option (car args)))
-       ,(mob-options methods))))
-
-(defun mob-options (methods)
-  (labels ((options (m &aux (option (car m)) (vars (cadr m)) (body (caddr m)))
-                   (cond ((null m) nil)
-                         (t (cons option (cons (lambda body (options (cdddr 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)))
+(in-package :gacela)
+
+(defmacro makemob (name &rest methods)
+  `(defun ,name (&rest args &aux (option (car args)))
+     ,(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