(no commit message)

diff --git a/src/gacela_mobs.scm b/src/gacela_mobs.scm
index 10123017a7f37c9c66cddf3228412f1f5afe51f0..a9c13fa1acc8994713ee7f94f3eeb1a2c9a9b951 100755 (executable)
--- a/src/gacela_mobs.scm
+++ b/src/gacela_mobs.scm
@@ -49,7 +49,11 @@
 
 
 (define-macro (show-mob mob)
-  `(show-mob-hash ',mob (lambda (option) (,mob option))))
+  (cond ((list? mob)
+        `(let ((m ,mob))
+           (show-mob-hash (m 'get-mob-id) m)))
+       (else
+        `(show-mob-hash (,mob 'get-mob-id) (lambda () (,mob))))))
 
 (define-macro (hide-mob mob)
   `(hide-mob-hash ',mob))
@@ -191,17 +195,6 @@
                        (lambda () (look attr))
                        (lambda (key . args) #f)))))))))
 
-(define-macro (define-mob mob-head . body)
-  (let ((name (car mob-head)) (attr (cdr mob-head)))
-    `(define ,(string->symbol (string-concatenate (list "make-" (symbol->string name))))
-       (lambda-mob ,attr ,@body))))
-
-(define-macro (lambda-mob attr . body)
-  `(lambda ()
-     (let ,(cons '(mob-id (gentemp)) attr)
-       (lambda ()
-        ,@body))))
-
 
 (define (get-mob-attr mob var)
   (let ((value (assoc-ref (mob 'get-attr) var)))
@@ -215,3 +208,24 @@
 
 (define (set-mob-look! mob look)
   (mob 'set-look look))
+
+
+
+
+
+(define-macro (define-mob mob-head . body)
+  (let ((name (car mob-head)) (attr (cdr mob-head)))
+    `(define ,(string->symbol (string-concatenate (list "make-" (symbol->string name))))
+       (lambda-mob ,attr ,@body))))
+
+(define-macro (lambda-mob attr . body)
+  `(lambda ()
+     (let ,(cons '(mob-id (gensym)) attr)
+       (lambda* (#:optional (option #f))
+        (case option
+          ((get-mob-id)
+           mob-id)
+          (else
+           (catch #t
+                  (lambda () ,@body)
+                  (lambda (key . args) #f))))))))