Make agentsets annotated lists, Implement count

[clnl] / src / main / package.lisp

diff --git a/src/main/package.lisp b/src/main/package.lisp
index 73202aaf31c1ca174b0164865ee88f8c947e4547..d9d95af89b10a14c3259a78d1af9c0a724c9ca58 100644 (file)
--- a/src/main/package.lisp
+++ b/src/main/package.lisp
@@ -1,5 +1,5 @@
 (defpackage #:clnl (:use :common-lisp)
 (defpackage #:clnl (:use :common-lisp)

- (:export #:run #:boot #:run-commands #:run-reporter)
+ (:export #:run #:boot #:run-commands #:run-reporter #:*model-package*)

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


@@ -15,10 +15,25 @@ the place that ties all the parts together into a cohesive whole."))
 All the code to convert the list of tokens coming from the lexer
 into an ast that can be transpiled later."))
 
 All the code to convert the list of tokens coming from the lexer
 into an ast that can be transpiled later."))
 

+(defpackage #:clnl-code-parser
+ (:use :common-lisp)
+ (:export #:parse #:globals)
+ (:documentation
+  "CLNL Code Parser
+
+A parser specifically for code from NetLogo models, that turns the lexed
+ast from an entire structured file into something more defined.
+
+This is different from the general parser (in clnl-parser) in that
+it's made for parsing the code section of nlogo files, and so works
+outside of the constraints.  In NetLogo, I believe this is analagous
+to the StructureParser, but I'm guessing there's weird overlap with
+other things."))
+

 (defpackage #:clnl-random
  (:use :common-lisp)
  (:shadow #:export)
 (defpackage #:clnl-random
  (:use :common-lisp)
  (:shadow #:export)

- (:export #:export #:set-seed #:next-int #:next-double)
+ (:export #:export #:set-seed #:next-int #:next-double #:next-long)

  (:documentation
   "Wrapper around mt19937.
 
  (:documentation
   "Wrapper around mt19937.
 


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

+ (:shadow #:random #:count)

  (:export #:export-world #:create-world #:current-state
   ; API as used by transpiled NetLogo programs
  (:export #:export-world #:create-world #:current-state
   ; API as used by transpiled NetLogo programs

+  #:agent-value

   #:ask
   #:ask

+  #:count

   #:create-turtles
   #:create-turtles

+  #:die
+  #:of

   #:forward
   #:forward

+  #:lookup-color
+  #:one-of
+  #:patches
+  #:reset-ticks
+  #:random

   #:random-float
   #:random-float

+  #:random-xcor
+  #:random-ycor
+  #:setxy

   #:show
   #:show

-  #:turtles)
+  #:turtles
+  #:tick
+  #:ticks
+  #:turn-right #:turn-left)

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


@@ -91,8 +122,8 @@ 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
 is where all the features that the traditional NetLogo UI lives."))
 
 (defpackage #:clnl-model

- (:use :common-lisp :cl-charms/low-level)
- (:export #:default-model #:read-from-nlogo #:world-dimensions)
+ (:use :common-lisp)
+ (:export #:default-model #:read-from-nlogo #:world-dimensions #:globals)

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