X-Git-Url: https://code.consxy.com/gitweb/gitweb.cgi?p=clnl;a=blobdiff_plain;f=src%2Fmain%2Ftranspile.lisp;h=0227fe4144ea9394937f8bdd1e77a5309b667015;hp=9dc373f6b74cbc29750fb6b1fc034e23604ec4e0;hb=82888b4c12ff462e539e9e7746d5268f9c46f330;hpb=9413d3737ae1c07d7ec2cad29ef3a6d50ab859a9 diff --git a/src/main/transpile.lisp b/src/main/transpile.lisp index 9dc373f..0227fe4 100644 --- a/src/main/transpile.lisp +++ b/src/main/transpile.lisp @@ -94,6 +94,7 @@ 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 :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 +104,11 @@ DESCRIPTION: (defun transpile-command-block (block) `(lambda () ,@(transpile-commands-inner (cdr block)))) +(defun transpile-reporter-block (block) + ;(when (/= (length block) 1) (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 +125,9 @@ DESCRIPTION: (defmacro defprim-alias (name real-symb) `(push (list :name ,name :real-symb ,real-symb) *prim-aliases*)) +(defmacro defagentvalueprim (name) + `(defsimpleprim ,name :reporter (clnl-nvm:agent-value ,name))) + ; We count on the parser to handle arguemnts for us, when collating things. (defsimpleprim := :reporter cl:equalp) @@ -143,6 +152,7 @@ DESCRIPTION: (defprim-alias :if-else :ifelse) (defsimpleprim :lt :command clnl-nvm:turn-left) (defkeywordprim :nobody) +(defsimpleprim :of :reporter clnl-nvm:of) (defsimpleprim :reset-ticks :command clnl-nvm:reset-ticks) (defsimpleprim :random-float :reporter clnl-nvm:random-float) (defsimpleprim :rt :command clnl-nvm:turn-right) @@ -150,6 +160,7 @@ DESCRIPTION: (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))))