- (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
; 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
The Common lisp code that is returned, when run, will return some value."
(cond
((numberp reporter) reporter) ; The parser converts to double for us
; 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"))
((eql :command-block (car reporter)) (transpile-command-block 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"))
((eql :command-block (car reporter)) (transpile-command-block reporter))
((eql :reporter-block (car reporter)) (transpile-reporter-block reporter))
((and (symbolp (car reporter)) (find (car reporter) *local-variables*))
(intern (symbol-name (car reporter)) clnl:*model-package*))
((eql :reporter-block (car reporter)) (transpile-reporter-block reporter))
((and (symbolp (car reporter)) (find (car reporter) *local-variables*))
(intern (symbol-name (car reporter)) clnl:*model-package*))
(defsimpleprim :+ :reporter cl:+)
(defsimpleprim :* :reporter cl:*)
(defsimpleprim :/ :reporter cl:/)
(defsimpleprim :+ :reporter cl:+)
(defsimpleprim :* :reporter cl:*)
(defsimpleprim :/ :reporter cl:/)
-(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))))
(defagentvalueprim :label)
(defagentvalueprim :label-color)
(defsimpleprim :lt :command clnl-nvm:turn-left)
(defagentvalueprim :label)
(defagentvalueprim :label-color)
(defsimpleprim :lt :command clnl-nvm:turn-left)
(defkeywordprim :nobody)
(defsimpleprim :one-of :reporter clnl-nvm:one-of)
(defsimpleprim :of :reporter clnl-nvm:of)
(defsimpleprim :patches :reporter clnl-nvm:patches)
(defagentvalueprim :pcolor)
(defsimpleprim :reset-ticks :command clnl-nvm:reset-ticks)
(defkeywordprim :nobody)
(defsimpleprim :one-of :reporter clnl-nvm:one-of)
(defsimpleprim :of :reporter clnl-nvm:of)
(defsimpleprim :patches :reporter clnl-nvm:patches)
(defagentvalueprim :pcolor)
(defsimpleprim :reset-ticks :command clnl-nvm:reset-ticks)
(defagentvalueprim :size)
(defsimpleprim :tick :command clnl-nvm:tick)
(defsimpleprim :ticks :reporter clnl-nvm:ticks)
(defsimpleprim :turtles :reporter clnl-nvm:turtles)
(defagentvalueprim :who)
(defagentvalueprim :size)
(defsimpleprim :tick :command clnl-nvm:tick)
(defsimpleprim :ticks :reporter clnl-nvm:ticks)
(defsimpleprim :turtles :reporter clnl-nvm:turtles)
(defagentvalueprim :who)
; Colors
(defmacro defcolorprim (color) `(defprim ,color :reporter (lambda () `(clnl-nvm:lookup-color ,,color))))
; Colors
(defmacro defcolorprim (color) `(defprim ,color :reporter (lambda () `(clnl-nvm:lookup-color ,,color))))