Make agentsets annotated lists, Implement count

[clnl] / src / main / parse.lisp

diff --git a/src/main/parse.lisp b/src/main/parse.lisp
index eeadd95d840122cd2b501160eae125f550484020..b3dd3d79c919eedd3b169eb5bdd1fb2b7988fb1d 100644 (file)
--- a/src/main/parse.lisp
+++ b/src/main/parse.lisp
@@ -224,7 +224,7 @@ DESCRIPTION:
 (defprim :clear-all ())
 (defprim :crt (:number))
 (defprim :color ())
-(defprim :count ())
+(defprim :count (:agentset))
 (defprim :die ())
 (defprim :display ())
 (defprim :with (:reporter-block))
@@ -239,6 +239,7 @@ DESCRIPTION:
 (defprim :not (:boolean))
 (defprim :nobody ())
 (defprim :one-of (t))
+(defprim :of (:reporter-block :agentset) :infix)
 (defprim :patches ())
 (defprim :pcolor ())
 (defprim :random (:number))
@@ -258,6 +259,7 @@ DESCRIPTION:
 (defprim :tick ())
 (defprim :ticks ())
 (defprim :turtles ())
+(defprim :who ())
 
 ; colors
 (defprim :black ())