Code - procedures

[clnl] / src / main / package.lisp

diff --git a/src/main/package.lisp b/src/main/package.lisp
index 356a408179b4f2a417c0becba1208b8db1e409ff..675a70ba7ea4fe7404b7230189fdf982955d3bd6 100644 (file)
--- a/src/main/package.lisp
+++ b/src/main/package.lisp
@@ -1,5 +1,7 @@
 (defpackage #:clnl (:use :common-lisp)
 (defpackage #:clnl (:use :common-lisp)

- (:export #:run #:boot #:run-commands #:run-reporter #:*model-package*)
+ (:export
+  #:run #:boot #:run-commands #:run-reporter #:*model-package*
+  #:model->multi-form-lisp #:model->single-form-lisp)

  (:documentation
   "Main CLNL package
 
  (:documentation
   "Main CLNL package
 


@@ -17,7 +19,7 @@ into an ast that can be transpiled later."))
 
 (defpackage #:clnl-code-parser
  (:use :common-lisp)
 
 (defpackage #:clnl-code-parser
  (:use :common-lisp)

- (:export #:parse #:globals)
+ (:export #:parse #:globals #:procedures)

  (:documentation
   "CLNL Code Parser
 
  (:documentation
   "CLNL Code Parser
 


@@ -43,7 +45,7 @@ to match how java.util.Random works.  Turtles, all the way down."))
 
 (defpackage #:clnl-transpiler
  (:use :common-lisp)
 
 (defpackage #:clnl-transpiler
  (:use :common-lisp)

- (:export #:transpile-commands #:transpile-reporter)
+ (:export #:transpile #:reporter-p #:command-list-p)

  (:documentation
   "CLNL Transpiler
 
  (:documentation
   "CLNL Transpiler
 


@@ -64,13 +66,17 @@ into an ast that can be transpiled later."))
 
 (defpackage #:clnl-nvm
  (:use :common-lisp)
 
 (defpackage #:clnl-nvm
  (:use :common-lisp)

- (:shadow #:random)
- (:export #:export-world #:create-world #:current-state
+ (:shadow #:random #:count)
+ (:export #:export-world #:create-world #:current-state #:with-stop-handler

   ; API as used by transpiled NetLogo programs
   #:agent-value
   #:ask
   ; API as used by transpiled NetLogo programs
   #:agent-value
   #:ask

+  #:clear-all
+  #:count

   #:create-turtles
   #:die
   #:create-turtles
   #:die

+  #:display
+  #:hatch

   #:of
   #:forward
   #:lookup-color
   #:of
   #:forward
   #:lookup-color


@@ -81,12 +87,15 @@ into an ast that can be transpiled later."))
   #:random-float
   #:random-xcor
   #:random-ycor
   #:random-float
   #:random-xcor
   #:random-ycor

+  #:set-default-shape

   #:setxy
   #:show
   #:setxy
   #:show

+  #:stop

   #:turtles
   #:tick
   #:ticks
   #:turtles
   #:tick
   #:ticks

-  #:turn-right #:turn-left)
+  #:turn-right #:turn-left
+  #:with)

  (:documentation
   "CLNL NVM
 
  (:documentation
   "CLNL NVM
 


@@ -122,7 +131,7 @@ is where all the features that the traditional NetLogo UI lives."))
 
 (defpackage #:clnl-model
  (:use :common-lisp)
 
 (defpackage #:clnl-model
  (:use :common-lisp)

- (:export #:default-model #:read-from-nlogo #:world-dimensions #:globals)
+ (:export #:default-model #:read-from-nlogo #:world-dimensions #:widget-globals #:code)

  (:documentation
   "CLNL Model
 
  (:documentation
   "CLNL Model
 


@@ -130,3 +139,7 @@ The representation, parsing, and serializing of NetLogo model files, including
 all of the sections, and subsections held within.  This package houses not only
 the code to read and write .nlogo files, but also the living state of the model
 as clnl runs."))
 all of the sections, and subsections held within.  This package houses not only
 the code to read and write .nlogo files, but also the living state of the model
 as clnl runs."))

+
+(defpackage #:clnl-default-model-package
+ (:use :common-lisp)
+ (:shadow #:go))