(set! hide-mob-hash
(lambda (key)
- (hash-remove! key)
+ (hash-remove! active-mobs key)
(set! changed #t)))
(set! get-active-mobs
(define-macro (hide-mob mob)
(cond ((list? mob)
`(let ((m ,mob))
- (hide-mob-hash (m 'get-mob-id) m)))
+ (hide-mob-hash (m 'get-mob-id))))
(else
- `(hide-mob-hash (,mob 'get-mob-id) (lambda () (,mob))))))
-
-(define-macro (kill-me)
- `(hide-mob-hash mob-id))
+ `(hide-mob-hash (,mob 'get-mob-id)))))
(define (run-mobs mobs)
(for-each
(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* (#:key ,@attr)
- (lambda-mob () ,@body)))))
+ (lambda* ,(if (null? attr) '() `(#:key ,@attr))
+ (the-mob ',name () ,attr ,@body)))))
+
+(define-macro (the-mob type attr publish . body)
+ (let ((mob-id-symbol (gensym))
+ (type-symbol (gensym)))
+ `(let ((,mob-id-symbol (gensym))
+ (,type-symbol ,type)
+ ,@attr)
+ (lambda* (#:optional (option #f))
+ (define (kill-me)
+ (hide-mob-hash ,mob-id-symbol))
+ (case option
+ ((get-mob-id)
+ ,mob-id-symbol)
+ ((get-type)
+ ,type-symbol)
+ (else
+ (display ,(cons 'list (map (lambda (x) `(cons ',(car x) ,(car x))) publish)))
+ (newline)
+ (catch #t
+ (lambda () ,@body)
+ (lambda (key . args) #f))))))))
(define-macro (lambda-mob attr . body)
- `(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)))))))
+ `(the-mob 'undefined ,attr '() ,@body))