X-Git-Url: https://code.consxy.com/gitweb/gitweb.cgi?a=blobdiff_plain;f=src%2Fmain%2Ftranspile.lisp;h=1d4a90c446a0a5f897175023433fd382ee76df36;hb=083d6c2;hp=9dc373f6b74cbc29750fb6b1fc034e23604ec4e0;hpb=9413d3737ae1c07d7ec2cad29ef3a6d50ab859a9;p=clnl

diff --git a/src/main/transpile.lisp b/src/main/transpile.lisp
index 9dc373f..1d4a90c 100644
--- a/src/main/transpile.lisp
+++ b/src/main/transpile.lisp
@@ -94,6 +94,8 @@ DESCRIPTION:
   ((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 :list-literal (car reporter)) (cons 'list (mapcar #'transpile-reporter (cdr 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*))
   ((not (find-prim (car reporter))) (error "Couldn't find the reporter for ~S" (car reporter)))
@@ -103,6 +105,11 @@ DESCRIPTION:
 (defun transpile-command-block (block)
  `(lambda () ,@(transpile-commands-inner (cdr block))))
 
+(defun transpile-reporter-block (block)
+ (when (/= (length block) 2) (error "Reporter block invalid ~S" block))
+ `(lambda ()
+   ,(transpile-reporter (cadr block))))
+
 ; Undoes the previous function :)
 (defun make-command-block-inline (block)
  (cddr block))
@@ -119,6 +126,9 @@ DESCRIPTION:
 (defmacro defprim-alias (name real-symb)
  `(push (list :name ,name :real-symb ,real-symb) *prim-aliases*))
 
+(defmacro defagentvalueprim (name)
+ `(defprim ,name :reporter (lambda () `(clnl-nvm:agent-value ,,name))))
+
 ; We count on the parser to handle arguemnts for us, when collating things.
 
 (defsimpleprim := :reporter cl:equalp)
@@ -129,8 +139,10 @@ DESCRIPTION:
 (defsimpleprim :+ :reporter cl:+)
 (defsimpleprim :* :reporter cl:*)
 (defsimpleprim :/ :reporter cl:/)
-(defprim :any? :reporter (lambda (agentset) `(> (length ,agentset) 0)))
+(defprim :any? :reporter (lambda (agentset) `(> (clnl-nvm:count ,agentset) 0)))
 (defsimpleprim :ask :command clnl-nvm:ask)
+(defagentvalueprim :color)
+(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)
@@ -141,15 +153,29 @@ DESCRIPTION:
                              ,@(make-command-block-inline b))))
 
 (defprim-alias :if-else :ifelse)
+(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)
+(defsimpleprim :random :reporter clnl-nvm:random)
 (defsimpleprim :random-float :reporter clnl-nvm:random-float)
+(defsimpleprim :random-xcor :reporter clnl-nvm:random-xcor)
+(defsimpleprim :random-ycor :reporter clnl-nvm:random-ycor)
 (defsimpleprim :rt :command clnl-nvm:turn-right)
 (defsimpleprim :show :command clnl-nvm:show)
+(defsimpleprim :set :command cl:setf)
+(defsimpleprim :setxy :command clnl-nvm:setxy)
+(defagentvalueprim :size)
 (defsimpleprim :tick :command clnl-nvm:tick)
 (defsimpleprim :ticks :reporter clnl-nvm:ticks)
 (defsimpleprim :turtles :reporter clnl-nvm:turtles)
+(defagentvalueprim :who)
+(defsimpleprim :with :reporter clnl-nvm:with)
 
 ; Colors
 (defmacro defcolorprim (color) `(defprim ,color :reporter (lambda () `(clnl-nvm:lookup-color ,,color))))