X-Git-Url: https://code.consxy.com/gitweb/gitweb.cgi?p=clnl;a=blobdiff_plain;f=src%2Fmain%2Fnvm%2Fbase.lisp;h=7fec1df58b86f5cef20f5c37cd98b8fc093939da;hp=063dfb5523bd7105f0698b5e11bbb59fb86da2bd;hb=807df6b6f160d82cc04ca02ce88d61ee58439ad1;hpb=3ae0c35e27580b247652dff608dd8c4d29f16bff

diff --git a/src/main/nvm/base.lisp b/src/main/nvm/base.lisp
index 063dfb5..7fec1df 100644
--- a/src/main/nvm/base.lisp
+++ b/src/main/nvm/base.lisp
@@ -15,6 +15,7 @@
 (defvar *breeds* nil)
 
 (define-condition stop nil nil)
+(define-condition death nil nil)
 
 (defmacro with-stop-handler (&rest forms)
  "MACRO WITH-STOP-HANDLER &rest FORMS => HANDLED-FORM
@@ -31,7 +32,13 @@ DESCRIPTION:
   :stop is returned."
  `(handler-case (progn ,@forms) (stop (s) (declare (ignore s)) :stop)))
 
-(defstruct turtle who breed color heading xcor ycor (label "") (label-color 9.9d0) (size 1d0) shape own-vars)
+(defmacro with-stop-and-death-handler (&rest forms)
+ `(handler-case
+   (progn ,@forms)
+   (stop (s) (declare (ignore s)) :stop)
+   (death (d) (declare (ignore d)) :death)))
+
+(defstruct turtle who breed color heading xcor ycor (label "") label-color size shape own-vars)
 (defstruct patch color xcor ycor own-vars turtles)
 
 (defun agentset-list (agentset)