(no commit message)

[gacela.git] / src / gacela_mobs.scm

diff --git a/src/gacela_mobs.scm b/src/gacela_mobs.scm
index c0507f5af6eb529a4a61a44f6fe1ac060cc8cb5a..927d8b138af7125823b8b549e1dcf20605211e83 100755 (executable)
--- a/src/gacela_mobs.scm
+++ b/src/gacela_mobs.scm
@@ -54,31 +54,31 @@
 
 ;;; Actions and looks for mobs
 
-(defmacro make-behaviour (name attr &rest code)
-  `(defun ,(get-behaviour-fun-name name) (object-attr)
-     (let ,(mapcar #'attribute-definition attr)
+(define (get-attr list name default)
+  (let ((value (assoc-ref list name)))
+    (cond (value (car value))
+         (else default))))
+
+(define (attr-def attr)
+  (let ((name (car attr))
+       (value (cadr attr)))
+    `(,name (get-attr attributes ',name ',value))))
+
+(define (attr-save attr)
+  (let ((name (car attr)))
+    `(assoc-set! attributes ',name (list ,name))))
+
+(define-macro (define-action action-head . code)
+  (let ((name (car action-head)) (attr (cdr action-head)))
+    `(define ,name
+       (lambda-action ,attr ,@code))))
+
+(define-macro (lambda-action attr . code)
+  `(lambda (attributes)
+     (let ,(map attr-def attr)
        ,@code
-       ,(cons 'progn (mapcar #'attribute-save (reverse attr)))
-       object-attr)))
-
-(defun get-behaviour-fun-name (name)
-  (intern (concatenate 'string "BEHAVIOUR-" (string-upcase (string name))) 'gacela))
-
-(defun attribute-name (attribute)
-  (intern (string attribute) 'keyword))
-
-(define (attribute-definition attribute)
-  (let* ((name (cond ((list? attribute) (car attribute))
-                    (else attribute)))
-        (pname (attribute-name name))
-        (value (cond ((listp attribute) (cadr attribute)))))
-    `(,name (getf object-attr ,pname ,value))))
-
-(defun attribute-save (attribute)
-  (let* ((name (cond ((listp attribute) (car attribute))
-                    (t attribute)))
-        (pname (attribute-name name)))
-    `(setf (getf object-attr ,pname) ,name)))
+       ,(cons 'begin (map attr-save attr))
+       attributes)))
 
 (define-macro (lambda-look . look)
   (define (process-look look)