(defun find-prim (symb)
(when symb
- (or
- (find symb *prims* :key #'prim-name)
- (find-prim (getf (find symb *prim-aliases* :key #'prim-name) :real-symb)))))
+ (find-if
+ (lambda (prim-name) (or (eql symb prim-name) (and (listp prim-name) (find symb prim-name))))
+ *prims* :key #'prim-name)))
; Let this grow, slowly but surely, eventually taking on calling context, etc.
; For now, it's just a
The Common lisp code that is returned, when run, will return some value."
(cond
((numberp reporter) reporter) ; The parser converts to double for us
+ ((stringp reporter) reporter)
; The parser should have checked that having a symbol here is ok
((symbolp reporter) (intern (symbol-name reporter) clnl:*model-package*))
((not (listp reporter)) (error "Expected a statement of some sort"))
(defprim :any? :reporter (lambda (agentset) `(> (clnl-nvm:count ,agentset) 0)))
(defsimpleprim :ask :command clnl-nvm:ask)
(defagentvalueprim :color)
+(defsimpleprim '(:clear-all :ca) :command clnl-nvm:clear-all)
(defsimpleprim :count :reporter clnl-nvm:count)
(defsimpleprim :crt :command clnl-nvm:create-turtles)
(defsimpleprim :die :command clnl-nvm:die)
(defsimpleprim :fd :command clnl-nvm:forward)
+(defsimpleprim :hatch :command clnl-nvm:hatch)
(defprim :if :command (lambda (pred a) `(when ,pred ,@(make-command-block-inline a))))
-(defprim :ifelse :command (lambda (pred a b)
- `(if ,pred
- ,@(make-command-block-inline a)
- ,@(make-command-block-inline b))))
+(defprim '(:ifelse :if-else)
+ :command (lambda (pred a b)
+ `(if ,pred
+ ,@(make-command-block-inline a)
+ ,@(make-command-block-inline b))))
-(defprim-alias :if-else :ifelse)
(defagentvalueprim :label)
(defagentvalueprim :label-color)
(defsimpleprim :lt :command clnl-nvm:turn-left)
+(defsimpleprim :not :reporter cl:not)
(defkeywordprim :nobody)
(defsimpleprim :one-of :reporter clnl-nvm:one-of)
(defsimpleprim :of :reporter clnl-nvm:of)
(defsimpleprim :random-float :reporter clnl-nvm:random-float)
(defsimpleprim :random-xcor :reporter clnl-nvm:random-xcor)
(defsimpleprim :random-ycor :reporter clnl-nvm:random-ycor)
+(defprim :round :reporter (lambda (n) `(ffloor (+ ,n 0.5d0))))
(defsimpleprim :rt :command clnl-nvm:turn-right)
-(defsimpleprim :show :command clnl-nvm:show)
(defsimpleprim :set :command cl:setf)
+(defsimpleprim :set-default-shape :command clnl-nvm:set-default-shape)
(defsimpleprim :setxy :command clnl-nvm:setxy)
+(defsimpleprim :show :command clnl-nvm:show)
(defagentvalueprim :size)
(defsimpleprim :tick :command clnl-nvm:tick)
(defsimpleprim :ticks :reporter clnl-nvm:ticks)