X-Git-Url: https://code.consxy.com/gitweb/gitweb.cgi?p=clnl;a=blobdiff_plain;f=src%2Fmain%2Ftranspile.lisp;h=3feedc2df85292309b56f95bc8d997647fbce667;hp=627a6a8907cc3cb4855d2e843268f4ce67e1c8ec;hb=9eef8ecae4fad1e01413807ebc80ae45b5990706;hpb=3528ea770bf54e0174976c48b64e036355b71601 diff --git a/src/main/transpile.lisp b/src/main/transpile.lisp index 627a6a8..3feedc2 100644 --- a/src/main/transpile.lisp +++ b/src/main/transpile.lisp @@ -90,10 +90,12 @@ DESCRIPTION: 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")) ((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*)) @@ -145,6 +147,7 @@ DESCRIPTION: (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 @@ -155,6 +158,7 @@ DESCRIPTION: (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) @@ -166,14 +170,16 @@ DESCRIPTION: (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 :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) (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))))