UI - View positioned correctly

[clnl] / src / main / package.lisp

diff --git a/src/main/package.lisp b/src/main/package.lisp
index 443f85d29f3d79dbb7a2851e1ab2dd8edccaabb8..970535e0085f0e250c92182370ac8dc1d85dac0a 100644 (file)
--- a/src/main/package.lisp
+++ b/src/main/package.lisp
@@ -1,7 +1,8 @@
 (defpackage #:clnl (:use :common-lisp)
  (:export
   #:run #:boot #:run-commands #:run-reporter #:*model-package*
-  #:model->multi-form-lisp #:model->single-form-lisp)
+  #:model->multi-form-lisp #:model->single-form-lisp
+  #:nlogo->lisp)
  (:documentation
   "Main CLNL package
 
@@ -64,44 +65,6 @@ the nvm in the same way that comes out of this transpiler
 All the code to convert the list of tokens coming from the lexer
 into an ast that can be transpiled later."))
 
-(defpackage #:clnl-nvm
- (:use :common-lisp)
- (:shadow #:random #:count)
- (:export #:export-world #:create-world #:current-state #:with-stop-handler
-  ; API as used by transpiled NetLogo programs
-  #:agent-value
-  #:ask
-  #:clear-all
-  #:count
-  #:create-turtles
-  #:die
-  #:display
-  #:hatch
-  #:of
-  #:forward
-  #:lookup-color
-  #:one-of
-  #:patches
-  #:reset-ticks
-  #:random
-  #:random-float
-  #:random-xcor
-  #:random-ycor
-  #:set-default-shape
-  #:setxy
-  #:show
-  #:stop
-  #:turtles
-  #:turtles-here
-  #:tick
-  #:ticks
-  #:turn-right #:turn-left
-  #:with)
- (:documentation
-  "CLNL NVM
-
-NetLogo Virtual Machine: the simulation engine."))
-
 (defpackage #:clnl-lexer
  (:use :common-lisp)
  (:export #:lex)
@@ -120,19 +83,11 @@ The NetLogo view interface using opengl.  This is responsible for taking the
 current state of the enging and displaying it.  Will not house any interface
 components."))
 
-(defpackage #:clnl-cli
- (:use :common-lisp :cl-charms/low-level)
- (:export #:run)
- (:documentation
-  "CLNL CLI
-
-The main NetLogo interface for interacting with the program.  Since CLNL is
-a command line interface program with a view for display purposes only, this
-is where all the features that the traditional NetLogo UI lives."))
-
 (defpackage #:clnl-model
  (:use :common-lisp)
- (:export #:default-model #:read-from-nlogo #:world-dimensions #:widget-globals #:code)
+ (:export
+  #:execute-button #:default-model #:read-from-nlogo #:world-dimensions #:widget-globals #:code
+  #:buttons #:view #:interface #:set-current-interface #:set-callback)
  (:documentation
   "CLNL Model
 
@@ -143,7 +98,7 @@ as clnl runs."))
 
 (defpackage #:clnl-extensions
  (:use :common-lisp)
- (:export #:load-extension)
+ (:export #:load-extension #:prims)
  (:documentation
   "CLNL Extensions