@@ -15,11 +15,48 @@

 <ul>

 <li>Clone this repository somewhere ASDF can find the system: e.g. <code>git clone https://github.com/fiddlerwoaroof/cl-edn.git ~/quicklisp/local-projects/cl-edn/</code></li>

-<li>At a REPL, <code>(ql:quickload :cl-edn)</code></li>

+<li>At a REPL, <code>(ql:quickload :cl-edn/fset)</code></li>

 </ul>

 <h1>Usage</h1>

+<h2>Conceptual Model:</h2>

+

+<p><code>

+                         +-------------+

+                         | SYNTHESIZER |

+                         +------+------+

+                                |

+                                V

++----------+      +----------------------------+

+| READ-EDN +----->| (PARSE string synthesizer) |

++----------+      +----------------------------+

+</code></p>

+

+<h2>Systems for Components:</h2>

+

+<ul>

+<li>CL-EDN:

+<ul>

+<li>READ-EDN</li>

+<li>PARSE</li>

+</ul></li>

+<li>CL-EDN/FSET:

+<ul>

+<li>'EDN:FSET: a synthesizer that uses FSET datastructures but

+preserves the case of keywords and symbols.</li>

+</ul></li>

+<li>CL-EDN/FSET-LOSSY:

+<ul>

+<li>'EDN:FSET-LOSSY: a synthesizer that uses FSET datastructures but

+uppercases keywords and symbols.  This is probably preferable for

+most cases where the data is only going to be used by Common Lisp,

+because CL symbols are uppercase by default</li>

+</ul></li>

+</ul>

+

+<h2>Notes:</h2>

+

 <p>This library divides the task of parsing EDN into two stages.  In the

 first stage, implemented by <code>(EDN:READ-EDN string)</code> an EDN file is is

 parsed into an AST where primitives are converted into lisp values and

@@ -2,11 +2,43 @@ Installation

 ============

 - Clone this repository somewhere ASDF can find the system: e.g. ```git clone https://github.com/fiddlerwoaroof/cl-edn.git ~/quicklisp/local-projects/cl-edn/```

-- At a REPL, ```(ql:quickload :cl-edn)```

+- At a REPL, ```(ql:quickload :cl-edn/fset)```

 Usage

 =====

+Conceptual Model:

+-----------------

+

+```

+                         +-------------+

+                         | SYNTHESIZER |

+                         +------+------+

+                                |

+                                V

++----------+      +----------------------------+

+| READ-EDN +----->| (PARSE string synthesizer) |

++----------+      +----------------------------+

+```

+

+Systems for Components:

+-----------------------

+

+- CL-EDN:

+    - READ-EDN

+    - PARSE

+- CL-EDN/FSET:

+    - 'EDN:FSET: a synthesizer that uses FSET datastructures but

+      preserves the case of keywords and symbols.

+- CL-EDN/FSET-LOSSY:

+    - 'EDN:FSET-LOSSY: a synthesizer that uses FSET datastructures but

+      uppercases keywords and symbols.  This is probably preferable for

+      most cases where the data is only going to be used by Common Lisp,

+      because CL symbols are uppercase by default

+

+Notes:

+------

+

 This library divides the task of parsing EDN into two stages.  In the

 first stage, implemented by `(EDN:READ-EDN string)` an EDN file is is

 parsed into an AST where primitives are converted into lisp values and

@@ -37,4 +37,5 @@

                     (uiop:symbol-call :st '#:test

                                       :package :edn-test))

   :components ((:file "package")

+               (:file "generate-edn")

                (:file "test")))

@@ -5,7 +5,17 @@

      until (<= min-nodes nodes max-nodes)

      finally (return (values edn nodes))))

+(defvar *last-edn*)

 (defun generate-edn ()

+  (multiple-value-bind (edn nodes) (%generate-edn)

+    (values (setf *last-edn* edn)

+            nodes)))

+

+(defun last-generated ()

+  (when (boundp '*last-edn*)

+    *last-edn*))

+

+(defun %generate-edn ()

   (case (random 3)

     (0 (generate-map))

     (1 (generate-set))

@@ -124,7 +134,7 @@

 (defun compound-or-primitive (&optional (primitive-func 'generate-primitive))

     (case (random 10)

-      (0 (generate-edn))

+      (0 (%generate-edn))

       (1 (funcall primitive-func))

       (2 (funcall primitive-func))

       (3 (funcall primitive-func))

@@ -12,7 +12,9 @@

 (defpackage :edn.generate

   (:use :cl)

-  (:export :generate-edn))

+  (:export :generate-edn

+           :generate-edn-in-range

+           :last-generated))

 (defpackage :edn-primitives

   (:use)

@@ -113,3 +113,10 @@

           (format nil "foobar~%qwer")

           "asdf"

           (smug:parse (edn::.string-ending) "foobar\\nqwer\"asdf")))

+

+(deftest smoke ()

+  (should be =

+          0

+          (loop repeat 0

+             for res = (edn:read-edn (edn.generate:generate-edn))

+             unless res sum 1)))