Merge branch 'develop' into feature/7

doc/lisp1.5.md

@@ -1721,6 +1721,7 @@ represented in storage only once,
 The following simple example has been included to illustrate the exact construction
 of list structures. Two types of list structures are shown, and a function for deriving
 one from the other is given in LISP.
+
 We assume that we have a list of the form
 n, = ((A B C) (D E F),... , (X Y z)),
 
@@ -2709,7 +2710,9 @@ If `deflist` or `define` is used twice on the same object with the same indicato
 The function attrib concatenates its two arguments by changing the last element of its first argument to point to the second argument. Thus it is commonly used to tack something onto the end of a property list. The value of attrib is the second argument.
 
 For example
-attrib[~~; (EXPR (LAMBDA (X) (COND ((ATOM X) X) (T (FF (CAR x))))))]
+```
+attrib[FF; (EXPR (LAMBDA (X) (COND ((ATOM X) X) (T (FF (CAR x))))))]
+```
 would put EXPR followed by the LAMBDA expression for FF onto the end of the prop-
 erty list for FF.
 

docs/cloverage/beowulf/bootstrap.clj.html

@@ -331,13 +331,13 @@
 <span class="not-tracked" title="0 out of 0 forms covered">
                 109&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;;;&nbsp;else
                 </span><br/>
-<span class="covered" title="3 out of 3 forms covered">
+<span class="covered" title="5 out of 5 forms covered">
                 110&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(beowulf.bootstrap&#x2F;EVAL&nbsp;expr
                 </span><br/>
-<span class="covered" title="6 out of 6 forms covered">
+<span class="partial" title="7 out of 11 forms covered">
                 111&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(merge-vars&nbsp;vars&nbsp;env)
                 </span><br/>
-<span class="partial" title="4 out of 8 forms covered">
+<span class="covered" title="1 out of 1 forms covered">
                 112&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;depth))))
                 </span><br/>
 <span class="blank" title="0 out of 0 forms covered">
@@ -352,13 +352,13 @@
 <span class="not-tracked" title="0 out of 0 forms covered">
                 116&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                 </span><br/>
-<span class="not-tracked" title="0 out of 0 forms covered">
+<span class="covered" title="2 out of 2 forms covered">
                 117&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Lisp&nbsp;1.5&nbsp;introduced&nbsp;`PROG`,&nbsp;and&nbsp;most&nbsp;Lisps&nbsp;have&nbsp;been&nbsp;stuck&nbsp;with&nbsp;it&nbsp;ever&nbsp;
                 </span><br/>
-<span class="covered" title="2 out of 2 forms covered">
+<span class="partial" title="3 out of 7 forms covered">
                 118&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;since.&nbsp;It&nbsp;introduces&nbsp;imperative&nbsp;programming&nbsp;into&nbsp;what&nbsp;should&nbsp;be&nbsp;a&nbsp;pure&nbsp;
                 </span><br/>
-<span class="partial" title="3 out of 7 forms covered">
+<span class="not-tracked" title="0 out of 0 forms covered">
                 119&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;functional&nbsp;language,&nbsp;and&nbsp;consequently&nbsp;it&#x27;s&nbsp;going&nbsp;to&nbsp;be&nbsp;a&nbsp;pig&nbsp;to&nbsp;implement.
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
@@ -757,7 +757,7 @@
 <span class="covered" title="5 out of 5 forms covered">
                 251&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;[lisp-fn&nbsp;(value&nbsp;function-symbol&nbsp;&#x27;(EXPR&nbsp;FEXPR))
                 </span><br/>
-<span class="partial" title="6 out of 8 forms covered">
+<span class="partial" title="7 out of 8 forms covered">
                 252&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;args&#x27;&nbsp;(cond&nbsp;(=&nbsp;NIL&nbsp;args)&nbsp;args
                 </span><br/>
 <span class="partial" title="3 out of 4 forms covered">

docs/cloverage/beowulf/cons_cell.clj.html

@@ -259,7 +259,7 @@
 <span class="covered" title="1 out of 1 forms covered">
                 085&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(if
                 </span><br/>
-<span class="partial" title="10 out of 13 forms covered">
+<span class="partial" title="11 out of 13 forms covered">
                 086&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(or
                 </span><br/>
 <span class="covered" title="4 out of 4 forms covered">
@@ -445,22 +445,22 @@
 <span class="not-tracked" title="0 out of 0 forms covered">
                 147&nbsp;&nbsp;&nbsp;&nbsp;clojure.lang.Counted
                 </span><br/>
-<span class="not-covered" title="0 out of 3 forms covered">
+<span class="covered" title="3 out of 3 forms covered">
                 148&nbsp;&nbsp;&nbsp;&nbsp;(count&nbsp;[this]&nbsp;(loop&nbsp;[cell&nbsp;this
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
                 149&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;result&nbsp;1]
                 </span><br/>
-<span class="not-covered" title="0 out of 1 forms covered">
+<span class="covered" title="1 out of 1 forms covered">
                 150&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(if
                 </span><br/>
-<span class="not-covered" title="0 out of 11 forms covered">
+<span class="covered" title="11 out of 11 forms covered">
                 151&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(and&nbsp;(coll?&nbsp;(.getCdr&nbsp;cell))&nbsp;(not=&nbsp;NIL&nbsp;(.getCdr&nbsp;cell)))
                 </span><br/>
-<span class="not-covered" title="0 out of 1 forms covered">
+<span class="covered" title="1 out of 1 forms covered">
                 152&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(recur&nbsp;(.getCdr&nbsp;cell)&nbsp;(inc&nbsp;result))
                 </span><br/>
-<span class="not-covered" title="0 out of 1 forms covered">
+<span class="covered" title="1 out of 1 forms covered">
                 153&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;result)))
                 </span><br/>
 <span class="blank" title="0 out of 0 forms covered">

docs/cloverage/beowulf/core.clj.html

@@ -154,10 +154,10 @@
 <span class="covered" title="1 out of 1 forms covered">
                 050&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:default&nbsp;default-sysout
                 </span><br/>
-<span class="partial" title="3 out of 8 forms covered">
+<span class="partial" title="7 out of 8 forms covered">
                 051&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:validate&nbsp;[#(and
                 </span><br/>
-<span class="not-covered" title="0 out of 4 forms covered">
+<span class="covered" title="4 out of 4 forms covered">
                 052&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(.exists&nbsp;(io&#x2F;file&nbsp;%))
                 </span><br/>
 <span class="not-covered" title="0 out of 3 forms covered">
@@ -170,40 +170,40 @@
                 055&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[&quot;-s&quot;&nbsp;&quot;--strict&quot;&nbsp;&quot;Strictly&nbsp;interpret&nbsp;the&nbsp;Lisp&nbsp;1.5&nbsp;language,&nbsp;without&nbsp;extensions.&quot;]
                 </span><br/>
 <span class="covered" title="4 out of 4 forms covered">
-                056&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[&quot;-t&quot;&nbsp;&quot;--time&quot;&nbsp;&quot;Time&nbsp;evaluations.&quot;]])
+                056&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[&quot;-t&quot;&nbsp;&quot;--time&quot;&nbsp;&quot;Time&nbsp;evaluations.&quot;]
+                </span><br/>
+<span class="covered" title="4 out of 4 forms covered">
+                057&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[&quot;-x&quot;&nbsp;&quot;--testing&quot;&nbsp;&quot;Disable&nbsp;the&nbsp;jline&nbsp;reader&nbsp;-&nbsp;useful&nbsp;when&nbsp;piping&nbsp;input.&quot;]])
                 </span><br/>
 <span class="blank" title="0 out of 0 forms covered">
-                057&nbsp;&nbsp;
+                058&nbsp;&nbsp;
                 </span><br/>
 <span class="covered" title="1 out of 1 forms covered">
-                058&nbsp;&nbsp;(defn-&nbsp;re&nbsp;
+                059&nbsp;&nbsp;(defn-&nbsp;re&nbsp;
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                059&nbsp;&nbsp;&nbsp;&nbsp;&quot;Like&nbsp;REPL,&nbsp;but&nbsp;it&nbsp;isn&#x27;t&nbsp;a&nbsp;loop&nbsp;and&nbsp;doesn&#x27;t&nbsp;print.&quot;
+                060&nbsp;&nbsp;&nbsp;&nbsp;&quot;Like&nbsp;REPL,&nbsp;but&nbsp;it&nbsp;isn&#x27;t&nbsp;a&nbsp;loop&nbsp;and&nbsp;doesn&#x27;t&nbsp;print.&quot;
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                060&nbsp;&nbsp;&nbsp;&nbsp;[input]
+                061&nbsp;&nbsp;&nbsp;&nbsp;[input]
                 </span><br/>
 <span class="covered" title="7 out of 7 forms covered">
-                061&nbsp;&nbsp;&nbsp;&nbsp;(EVAL&nbsp;(READ&nbsp;input)&nbsp;NIL&nbsp;0))
+                062&nbsp;&nbsp;&nbsp;&nbsp;(EVAL&nbsp;(READ&nbsp;input)&nbsp;NIL&nbsp;0))
                 </span><br/>
 <span class="blank" title="0 out of 0 forms covered">
-                062&nbsp;&nbsp;
+                063&nbsp;&nbsp;
                 </span><br/>
 <span class="covered" title="1 out of 1 forms covered">
-                063&nbsp;&nbsp;(defn&nbsp;repl
+                064&nbsp;&nbsp;(defn&nbsp;repl
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                064&nbsp;&nbsp;&nbsp;&nbsp;&quot;Read&#x2F;eval&#x2F;print&nbsp;loop.&quot;
+                065&nbsp;&nbsp;&nbsp;&nbsp;&quot;Read&#x2F;eval&#x2F;print&nbsp;loop.&quot;
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                065&nbsp;&nbsp;&nbsp;&nbsp;[prompt]
+                066&nbsp;&nbsp;&nbsp;&nbsp;[prompt]
                 </span><br/>
 <span class="covered" title="1 out of 1 forms covered">
-                066&nbsp;&nbsp;&nbsp;&nbsp;(loop&nbsp;[]
+                067&nbsp;&nbsp;&nbsp;&nbsp;(loop&nbsp;[]&nbsp;
-                </span><br/>
-<span class="covered" title="3 out of 3 forms covered">
-                067&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(print&nbsp;prompt)
                 </span><br/>
 <span class="covered" title="2 out of 2 forms covered">
                 068&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(flush)
@@ -211,8 +211,8 @@
 <span class="covered" title="1 out of 1 forms covered">
                 069&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(try
                 </span><br/>
-<span class="covered" title="9 out of 9 forms covered">
+<span class="covered" title="10 out of 10 forms covered">
-                070&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(if-let&nbsp;[input&nbsp;(trim&nbsp;(read-from-console))]
+                070&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(if-let&nbsp;[input&nbsp;(trim&nbsp;(read-from-console&nbsp;prompt))]
                 </span><br/>
 <span class="covered" title="4 out of 4 forms covered">
                 071&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(if&nbsp;(=&nbsp;input&nbsp;stop-word)
@@ -259,7 +259,7 @@
 <span class="covered" title="1 out of 1 forms covered">
                 085&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;data
                 </span><br/>
-<span class="partial" title="5 out of 6 forms covered">
+<span class="covered" title="6 out of 6 forms covered">
                 086&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(case&nbsp;(:cause&nbsp;data)
                 </span><br/>
 <span class="not-covered" title="0 out of 5 forms covered">
@@ -316,13 +316,13 @@
 <span class="covered" title="6 out of 6 forms covered">
                 104&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(str&nbsp;&quot;Síðe&nbsp;&quot;&nbsp;(System&#x2F;getProperty&nbsp;&quot;beowulf.version&quot;)&nbsp;&quot;\n&quot;))
                 </span><br/>
-<span class="partial" title="1 out of 2 forms covered">
+<span class="covered" title="2 out of 2 forms covered">
                 105&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(when
                 </span><br/>
 <span class="covered" title="5 out of 5 forms covered">
                 106&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(:help&nbsp;(:options&nbsp;args))
                 </span><br/>
-<span class="not-covered" title="0 out of 3 forms covered">
+<span class="covered" title="3 out of 3 forms covered">
                 107&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(:summary&nbsp;args))
                 </span><br/>
 <span class="covered" title="5 out of 5 forms covered">
@@ -358,8 +358,8 @@
 <span class="covered" title="1 out of 1 forms covered">
                 118&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(try
                 </span><br/>
-<span class="covered" title="10 out of 10 forms covered">
+<span class="covered" title="7 out of 7 forms covered">
-                119&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(repl&nbsp;(str&nbsp;(:prompt&nbsp;(:options&nbsp;args))&nbsp;&quot;&nbsp;&quot;))
+                119&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(repl&nbsp;(:prompt&nbsp;(:options&nbsp;args)))
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
                 120&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(catch

docs/cloverage/beowulf/io.clj.html

@@ -334,13 +334,13 @@
 <span class="not-tracked" title="0 out of 0 forms covered">
                 110&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;reference.&quot;
                 </span><br/>
-<span class="not-tracked" title="0 out of 0 forms covered">
+<span class="partial" title="1 out of 3 forms covered">
                 111&nbsp;&nbsp;&nbsp;&nbsp;([entry]
                 </span><br/>
 <span class="partial" title="9 out of 12 forms covered">
                 112&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(or&nbsp;(resolve-subr&nbsp;entry&nbsp;&#x27;SUBR)
                 </span><br/>
-<span class="partial" title="1 out of 6 forms covered">
+<span class="not-covered" title="0 out of 3 forms covered">
                 113&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(resolve-subr&nbsp;entry&nbsp;&#x27;FSUBR)))
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">

docs/cloverage/beowulf/oblist.clj.html

@@ -133,8 +133,8 @@
 <span class="not-tracked" title="0 out of 0 forms covered">
                 043&nbsp;&nbsp;&nbsp;&nbsp;&quot;Command&nbsp;line&nbsp;options&nbsp;from&nbsp;invocation.&quot;
                 </span><br/>
-<span class="covered" title="1 out of 1 forms covered">
+<span class="covered" title="3 out of 3 forms covered">
-                044&nbsp;&nbsp;&nbsp;&nbsp;{})
+                044&nbsp;&nbsp;&nbsp;&nbsp;{:testing&nbsp;true})
                 </span><br/>
 <span class="blank" title="0 out of 0 forms covered">
                 045&nbsp;&nbsp;

docs/cloverage/beowulf/read.clj.html

@@ -50,283 +50,319 @@
                 015    switch."
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                016&nbsp;&nbsp;&nbsp;&nbsp;(:require&nbsp;;;&nbsp;[beowulf.reader.char-reader&nbsp;:refer&nbsp;[read-chars]]
+                016&nbsp;&nbsp;&nbsp;&nbsp;(:require&nbsp;[beowulf.oblist&nbsp;:refer&nbsp;[*options*]]
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                017&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[beowulf.reader.generate&nbsp;:refer&nbsp;[generate]]
+                017&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[beowulf.reader.char-reader&nbsp;:refer&nbsp;[read-chars]]
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                018&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[beowulf.reader.parser&nbsp;:refer&nbsp;[parse]]
+                018&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[beowulf.reader.generate&nbsp;:refer&nbsp;[generate]]
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                019&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[beowulf.reader.simplify&nbsp;:refer&nbsp;[simplify]]
+                019&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[beowulf.reader.parser&nbsp;:refer&nbsp;[parse]]
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                020&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[clojure.string&nbsp;:refer&nbsp;[join&nbsp;split&nbsp;starts-with?&nbsp;trim]])
+                020&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[beowulf.reader.simplify&nbsp;:refer&nbsp;[simplify]]
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                021&nbsp;&nbsp;&nbsp;&nbsp;(:import&nbsp;[java.io&nbsp;InputStream]
+                021&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[clojure.string&nbsp;:refer&nbsp;[join&nbsp;split&nbsp;starts-with?&nbsp;trim]])
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                022&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[instaparse.gll&nbsp;Failure]))
+                022&nbsp;&nbsp;&nbsp;&nbsp;(:import&nbsp;[instaparse.gll&nbsp;Failure]
+                </span><br/>
+<span class="not-tracked" title="0 out of 0 forms covered">
+                023&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[java.io&nbsp;InputStream]))
                 </span><br/>
 <span class="blank" title="0 out of 0 forms covered">
-                023&nbsp;&nbsp;
+                024&nbsp;&nbsp;
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                024&nbsp;&nbsp;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+                025&nbsp;&nbsp;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                025&nbsp;&nbsp;;;;
+                026&nbsp;&nbsp;;;;
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                026&nbsp;&nbsp;;;;&nbsp;This&nbsp;file&nbsp;provides&nbsp;the&nbsp;reader&nbsp;required&nbsp;for&nbsp;boostrapping.&nbsp;It&#x27;s&nbsp;not&nbsp;a&nbsp;bad
+                027&nbsp;&nbsp;;;;&nbsp;This&nbsp;file&nbsp;provides&nbsp;the&nbsp;reader&nbsp;required&nbsp;for&nbsp;boostrapping.&nbsp;It&#x27;s&nbsp;not&nbsp;a&nbsp;bad
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                027&nbsp;&nbsp;;;;&nbsp;reader&nbsp;-&nbsp;it&nbsp;provides&nbsp;feedback&nbsp;on&nbsp;errors&nbsp;found&nbsp;in&nbsp;the&nbsp;input&nbsp;-&nbsp;but&nbsp;it&nbsp;isn&#x27;t
+                028&nbsp;&nbsp;;;;&nbsp;reader&nbsp;-&nbsp;it&nbsp;provides&nbsp;feedback&nbsp;on&nbsp;errors&nbsp;found&nbsp;in&nbsp;the&nbsp;input&nbsp;-&nbsp;but&nbsp;it&nbsp;isn&#x27;t
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                028&nbsp;&nbsp;;;;&nbsp;the&nbsp;real&nbsp;Lisp&nbsp;reader.
+                029&nbsp;&nbsp;;;;&nbsp;the&nbsp;real&nbsp;Lisp&nbsp;reader.
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                029&nbsp;&nbsp;;;;
+                030&nbsp;&nbsp;;;;
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                030&nbsp;&nbsp;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+                031&nbsp;&nbsp;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                031&nbsp;&nbsp;;;;
+                032&nbsp;&nbsp;;;;
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                032&nbsp;&nbsp;;;;&nbsp;Copyright&nbsp;(C)&nbsp;2022-2023&nbsp;Simon&nbsp;Brooke
+                033&nbsp;&nbsp;;;;&nbsp;Copyright&nbsp;(C)&nbsp;2022-2023&nbsp;Simon&nbsp;Brooke
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                033&nbsp;&nbsp;;;;
+                034&nbsp;&nbsp;;;;
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                034&nbsp;&nbsp;;;;&nbsp;This&nbsp;program&nbsp;is&nbsp;free&nbsp;software;&nbsp;you&nbsp;can&nbsp;redistribute&nbsp;it&nbsp;and&#x2F;or
+                035&nbsp;&nbsp;;;;&nbsp;This&nbsp;program&nbsp;is&nbsp;free&nbsp;software;&nbsp;you&nbsp;can&nbsp;redistribute&nbsp;it&nbsp;and&#x2F;or
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                035&nbsp;&nbsp;;;;&nbsp;modify&nbsp;it&nbsp;under&nbsp;the&nbsp;terms&nbsp;of&nbsp;the&nbsp;GNU&nbsp;General&nbsp;Public&nbsp;License
+                036&nbsp;&nbsp;;;;&nbsp;modify&nbsp;it&nbsp;under&nbsp;the&nbsp;terms&nbsp;of&nbsp;the&nbsp;GNU&nbsp;General&nbsp;Public&nbsp;License
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                036&nbsp;&nbsp;;;;&nbsp;as&nbsp;published&nbsp;by&nbsp;the&nbsp;Free&nbsp;Software&nbsp;Foundation;&nbsp;either&nbsp;version&nbsp;2
+                037&nbsp;&nbsp;;;;&nbsp;as&nbsp;published&nbsp;by&nbsp;the&nbsp;Free&nbsp;Software&nbsp;Foundation;&nbsp;either&nbsp;version&nbsp;2
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                037&nbsp;&nbsp;;;;&nbsp;of&nbsp;the&nbsp;License,&nbsp;or&nbsp;(at&nbsp;your&nbsp;option)&nbsp;any&nbsp;later&nbsp;version.
+                038&nbsp;&nbsp;;;;&nbsp;of&nbsp;the&nbsp;License,&nbsp;or&nbsp;(at&nbsp;your&nbsp;option)&nbsp;any&nbsp;later&nbsp;version.
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                038&nbsp;&nbsp;;;;&nbsp;
+                039&nbsp;&nbsp;;;;&nbsp;
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                039&nbsp;&nbsp;;;;&nbsp;This&nbsp;program&nbsp;is&nbsp;distributed&nbsp;in&nbsp;the&nbsp;hope&nbsp;that&nbsp;it&nbsp;will&nbsp;be&nbsp;useful,
+                040&nbsp;&nbsp;;;;&nbsp;This&nbsp;program&nbsp;is&nbsp;distributed&nbsp;in&nbsp;the&nbsp;hope&nbsp;that&nbsp;it&nbsp;will&nbsp;be&nbsp;useful,
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                040&nbsp;&nbsp;;;;&nbsp;but&nbsp;WITHOUT&nbsp;ANY&nbsp;WARRANTY;&nbsp;without&nbsp;even&nbsp;the&nbsp;implied&nbsp;warranty&nbsp;of
+                041&nbsp;&nbsp;;;;&nbsp;but&nbsp;WITHOUT&nbsp;ANY&nbsp;WARRANTY;&nbsp;without&nbsp;even&nbsp;the&nbsp;implied&nbsp;warranty&nbsp;of
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                041&nbsp;&nbsp;;;;&nbsp;MERCHANTABILITY&nbsp;or&nbsp;FITNESS&nbsp;FOR&nbsp;A&nbsp;PARTICULAR&nbsp;PURPOSE.&nbsp;&nbsp;See&nbsp;the
+                042&nbsp;&nbsp;;;;&nbsp;MERCHANTABILITY&nbsp;or&nbsp;FITNESS&nbsp;FOR&nbsp;A&nbsp;PARTICULAR&nbsp;PURPOSE.&nbsp;&nbsp;See&nbsp;the
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                042&nbsp;&nbsp;;;;&nbsp;GNU&nbsp;General&nbsp;Public&nbsp;License&nbsp;for&nbsp;more&nbsp;details.
+                043&nbsp;&nbsp;;;;&nbsp;GNU&nbsp;General&nbsp;Public&nbsp;License&nbsp;for&nbsp;more&nbsp;details.
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                043&nbsp;&nbsp;;;;&nbsp;
+                044&nbsp;&nbsp;;;;&nbsp;
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                044&nbsp;&nbsp;;;;&nbsp;You&nbsp;should&nbsp;have&nbsp;received&nbsp;a&nbsp;copy&nbsp;of&nbsp;the&nbsp;GNU&nbsp;General&nbsp;Public&nbsp;License
+                045&nbsp;&nbsp;;;;&nbsp;You&nbsp;should&nbsp;have&nbsp;received&nbsp;a&nbsp;copy&nbsp;of&nbsp;the&nbsp;GNU&nbsp;General&nbsp;Public&nbsp;License
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                045&nbsp;&nbsp;;;;&nbsp;along&nbsp;with&nbsp;this&nbsp;program;&nbsp;if&nbsp;not,&nbsp;write&nbsp;to&nbsp;the&nbsp;Free&nbsp;Software
+                046&nbsp;&nbsp;;;;&nbsp;along&nbsp;with&nbsp;this&nbsp;program;&nbsp;if&nbsp;not,&nbsp;write&nbsp;to&nbsp;the&nbsp;Free&nbsp;Software
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                046&nbsp;&nbsp;;;;&nbsp;Foundation,&nbsp;Inc.,&nbsp;51&nbsp;Franklin&nbsp;Street,&nbsp;Fifth&nbsp;Floor,&nbsp;Boston,&nbsp;MA&nbsp;&nbsp;02110-1301,&nbsp;USA.
+                047&nbsp;&nbsp;;;;&nbsp;Foundation,&nbsp;Inc.,&nbsp;51&nbsp;Franklin&nbsp;Street,&nbsp;Fifth&nbsp;Floor,&nbsp;Boston,&nbsp;MA&nbsp;&nbsp;02110-1301,&nbsp;USA.
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                047&nbsp;&nbsp;;;;
+                048&nbsp;&nbsp;;;;
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                048&nbsp;&nbsp;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+                049&nbsp;&nbsp;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
                 </span><br/>
 <span class="blank" title="0 out of 0 forms covered">
-                049&nbsp;&nbsp;
+                050&nbsp;&nbsp;
                 </span><br/>
 <span class="covered" title="1 out of 1 forms covered">
-                050&nbsp;&nbsp;(defn&nbsp;strip-line-comments
+                051&nbsp;&nbsp;(defn&nbsp;strip-line-comments
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                051&nbsp;&nbsp;&nbsp;&nbsp;&quot;Strip&nbsp;blank&nbsp;lines&nbsp;and&nbsp;comment&nbsp;lines&nbsp;from&nbsp;this&nbsp;string&nbsp;`s`,&nbsp;expected&nbsp;to
+                052&nbsp;&nbsp;&nbsp;&nbsp;&quot;Strip&nbsp;blank&nbsp;lines&nbsp;and&nbsp;comment&nbsp;lines&nbsp;from&nbsp;this&nbsp;string&nbsp;`s`,&nbsp;expected&nbsp;to
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                052&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;be&nbsp;Lisp&nbsp;source.&quot;
+                053&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;be&nbsp;Lisp&nbsp;source.&quot;
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                053&nbsp;&nbsp;&nbsp;&nbsp;[^String&nbsp;s]
+                054&nbsp;&nbsp;&nbsp;&nbsp;[^String&nbsp;s]
                 </span><br/>
 <span class="covered" title="3 out of 3 forms covered">
-                054&nbsp;&nbsp;&nbsp;&nbsp;(join&nbsp;&quot;\n&quot;
+                055&nbsp;&nbsp;&nbsp;&nbsp;(join&nbsp;&quot;\n&quot;
                 </span><br/>
 <span class="covered" title="3 out of 3 forms covered">
-                055&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(remove
+                056&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(remove
                 </span><br/>
 <span class="covered" title="9 out of 9 forms covered">
-                056&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;#(or&nbsp;(empty?&nbsp;%)
+                057&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;#(or&nbsp;(empty?&nbsp;%)
                 </span><br/>
 <span class="covered" title="4 out of 4 forms covered">
-                057&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(starts-with?&nbsp;(trim&nbsp;%)&nbsp;&quot;;;&quot;))
+                058&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(starts-with?&nbsp;(trim&nbsp;%)&nbsp;&quot;;;&quot;))
                 </span><br/>
 <span class="covered" title="4 out of 4 forms covered">
-                058&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(split&nbsp;s&nbsp;#&quot;\n&quot;))))
+                059&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(split&nbsp;s&nbsp;#&quot;\n&quot;))))
                 </span><br/>
 <span class="blank" title="0 out of 0 forms covered">
-                059&nbsp;&nbsp;
+                060&nbsp;&nbsp;
                 </span><br/>
 <span class="covered" title="1 out of 1 forms covered">
-                060&nbsp;&nbsp;(defn&nbsp;number-lines
+                061&nbsp;&nbsp;(defn&nbsp;number-lines
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                061&nbsp;&nbsp;&nbsp;&nbsp;([^String&nbsp;s]
+                062&nbsp;&nbsp;&nbsp;&nbsp;([^String&nbsp;s]
                 </span><br/>
 <span class="not-covered" title="0 out of 4 forms covered">
-                062&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(number-lines&nbsp;s&nbsp;nil))
+                063&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(number-lines&nbsp;s&nbsp;nil))
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                063&nbsp;&nbsp;&nbsp;&nbsp;([^String&nbsp;s&nbsp;^Failure&nbsp;e]
+                064&nbsp;&nbsp;&nbsp;&nbsp;([^String&nbsp;s&nbsp;^Failure&nbsp;e]
                 </span><br/>
 <span class="not-covered" title="0 out of 4 forms covered">
-                064&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;[l&nbsp;(-&gt;&nbsp;e&nbsp;:line)
+                065&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;[l&nbsp;(-&gt;&nbsp;e&nbsp;:line)
                 </span><br/>
 <span class="not-covered" title="0 out of 3 forms covered">
-                065&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;c&nbsp;(-&gt;&nbsp;e&nbsp;:column)]
+                066&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;c&nbsp;(-&gt;&nbsp;e&nbsp;:column)]
                 </span><br/>
 <span class="not-covered" title="0 out of 3 forms covered">
-                066&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(join&nbsp;&quot;\n&quot;
+                067&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(join&nbsp;&quot;\n&quot;
                 </span><br/>
 <span class="not-covered" title="0 out of 11 forms covered">
-                067&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(map&nbsp;#(str&nbsp;(format&nbsp;&quot;%5d&nbsp;%s&quot;&nbsp;(inc&nbsp;%1)&nbsp;%2)
+                068&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(map&nbsp;#(str&nbsp;(format&nbsp;&quot;%5d&nbsp;%s&quot;&nbsp;(inc&nbsp;%1)&nbsp;%2)
                 </span><br/>
 <span class="not-covered" title="0 out of 6 forms covered">
-                068&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(when&nbsp;(=&nbsp;l&nbsp;(inc&nbsp;%1))
+                069&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(when&nbsp;(=&nbsp;l&nbsp;(inc&nbsp;%1))
                 </span><br/>
 <span class="not-covered" title="0 out of 11 forms covered">
-                069&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(str&nbsp;&quot;\n&quot;&nbsp;(apply&nbsp;str&nbsp;(repeat&nbsp;c&nbsp;&quot;&nbsp;&quot;))&nbsp;&quot;^&quot;)))
+                070&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(str&nbsp;&quot;\n&quot;&nbsp;(apply&nbsp;str&nbsp;(repeat&nbsp;c&nbsp;&quot;&nbsp;&quot;))&nbsp;&quot;^&quot;)))
                 </span><br/>
 <span class="not-covered" title="0 out of 2 forms covered">
-                070&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(range)
+                071&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(range)
                 </span><br/>
 <span class="not-covered" title="0 out of 4 forms covered">
-                071&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(split&nbsp;s&nbsp;#&quot;\n&quot;))))))
+                072&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(split&nbsp;s&nbsp;#&quot;\n&quot;))))))
                 </span><br/>
 <span class="blank" title="0 out of 0 forms covered">
-                072&nbsp;&nbsp;
+                073&nbsp;&nbsp;
                 </span><br/>
 <span class="covered" title="1 out of 1 forms covered">
-                073&nbsp;&nbsp;(defn&nbsp;gsp
+                074&nbsp;&nbsp;(defn&nbsp;gsp
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                074&nbsp;&nbsp;&nbsp;&nbsp;&quot;Shortcut&nbsp;macro&nbsp;-&nbsp;the&nbsp;internals&nbsp;of&nbsp;read;&nbsp;or,&nbsp;if&nbsp;you&nbsp;like,&nbsp;read-string.
+                075&nbsp;&nbsp;&nbsp;&nbsp;&quot;Shortcut&nbsp;macro&nbsp;-&nbsp;the&nbsp;internals&nbsp;of&nbsp;read;&nbsp;or,&nbsp;if&nbsp;you&nbsp;like,&nbsp;read-string.
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                075&nbsp;&nbsp;&nbsp;&nbsp;Argument&nbsp;`s`&nbsp;should&nbsp;be&nbsp;a&nbsp;string&nbsp;representation&nbsp;of&nbsp;a&nbsp;valid&nbsp;Lisp
+                076&nbsp;&nbsp;&nbsp;&nbsp;Argument&nbsp;`s`&nbsp;should&nbsp;be&nbsp;a&nbsp;string&nbsp;representation&nbsp;of&nbsp;a&nbsp;valid&nbsp;Lisp
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                076&nbsp;&nbsp;&nbsp;&nbsp;expression.&quot;
+                077&nbsp;&nbsp;&nbsp;&nbsp;expression.&quot;
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                077&nbsp;&nbsp;&nbsp;&nbsp;[s]
+                078&nbsp;&nbsp;&nbsp;&nbsp;[s]
                 </span><br/>
 <span class="covered" title="4 out of 4 forms covered">
-                078&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;[source&nbsp;(strip-line-comments&nbsp;s)
+                079&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;[source&nbsp;(strip-line-comments&nbsp;s)
                 </span><br/>
 <span class="covered" title="3 out of 3 forms covered">
-                079&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;parse-tree&nbsp;(parse&nbsp;source)]
+                080&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;parse-tree&nbsp;(parse&nbsp;source)]
                 </span><br/>
 <span class="covered" title="5 out of 5 forms covered">
-                080&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(if&nbsp;(instance?&nbsp;Failure&nbsp;parse-tree)
+                081&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(if&nbsp;(instance?&nbsp;Failure&nbsp;parse-tree)
                 </span><br/>
 <span class="not-covered" title="0 out of 8 forms covered">
-                081&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(doall&nbsp;(println&nbsp;(number-lines&nbsp;source&nbsp;parse-tree))
+                082&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(doall&nbsp;(println&nbsp;(number-lines&nbsp;source&nbsp;parse-tree))
                 </span><br/>
 <span class="not-covered" title="0 out of 9 forms covered">
-                082&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(throw&nbsp;(ex-info&nbsp;&quot;Ne&nbsp;can&nbsp;forstande&nbsp;&quot;&nbsp;(assoc&nbsp;parse-tree&nbsp;:source&nbsp;source))))
+                083&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(throw&nbsp;(ex-info&nbsp;&quot;Ne&nbsp;can&nbsp;forstande&nbsp;&quot;&nbsp;(assoc&nbsp;parse-tree&nbsp;:source&nbsp;source))))
                 </span><br/>
 <span class="covered" title="5 out of 5 forms covered">
-                083&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(generate&nbsp;(simplify&nbsp;parse-tree)))))
+                084&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(generate&nbsp;(simplify&nbsp;parse-tree)))))
                 </span><br/>
 <span class="blank" title="0 out of 0 forms covered">
-                084&nbsp;&nbsp;
+                085&nbsp;&nbsp;
                 </span><br/>
 <span class="covered" title="1 out of 1 forms covered">
-                085&nbsp;&nbsp;(defn&nbsp;read-from-console
+                086&nbsp;&nbsp;(defn-&nbsp;dummy-read-chars&nbsp;[prompt]
-                </span><br/>
-<span class="not-tracked" title="0 out of 0 forms covered">
-                086&nbsp;&nbsp;&nbsp;&nbsp;&quot;Attempt&nbsp;to&nbsp;read&nbsp;a&nbsp;complete&nbsp;lisp&nbsp;expression&nbsp;from&nbsp;the&nbsp;console.&nbsp;NOTE&nbsp;that&nbsp;this
-                </span><br/>
-<span class="not-tracked" title="0 out of 0 forms covered">
-                087&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;will&nbsp;only&nbsp;really&nbsp;work&nbsp;for&nbsp;S-Expressions,&nbsp;not&nbsp;M-Expressions.&quot;
-                </span><br/>
-<span class="not-tracked" title="0 out of 0 forms covered">
-                088&nbsp;&nbsp;&nbsp;&nbsp;[]
                 </span><br/>
 <span class="covered" title="3 out of 3 forms covered">
-                089&nbsp;&nbsp;&nbsp;&nbsp;(loop&nbsp;[r&nbsp;(read-line)]
+                087&nbsp;&nbsp;&nbsp;&nbsp;(loop&nbsp;[r&nbsp;&quot;&quot;&nbsp;p&nbsp;prompt]
                 </span><br/>
-<span class="partial" title="11 out of 12 forms covered">
+<span class="partial" title="12 out of 13 forms covered">
-                090&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(if&nbsp;(and&nbsp;(=&nbsp;(count&nbsp;(re-seq&nbsp;#&quot;\(&quot;&nbsp;r))
+                088&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(if&nbsp;(and&nbsp;(seq&nbsp;r)
-                </span><br/>
-<span class="covered" title="5 out of 5 forms covered">
-                091&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(count&nbsp;(re-seq&nbsp;#&quot;\)&quot;&nbsp;r)))
-                </span><br/>
-<span class="covered" title="5 out of 5 forms covered">
-                092&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(=&nbsp;(count&nbsp;(re-seq&nbsp;#&quot;\[&quot;&nbsp;r))
-                </span><br/>
-<span class="covered" title="5 out of 5 forms covered">
-                093&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(count&nbsp;(re-seq&nbsp;#&quot;\]&quot;&nbsp;r))))
-                </span><br/>
-<span class="covered" title="1 out of 1 forms covered">
-                094&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;r
-                </span><br/>
-<span class="not-covered" title="0 out of 1 forms covered">
-                095&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(recur&nbsp;(str&nbsp;r&nbsp;&quot;\n&quot;&nbsp;(read-line))))))
-                </span><br/>
-<span class="blank" title="0 out of 0 forms covered">
-                096&nbsp;&nbsp;
-                </span><br/>
-<span class="covered" title="1 out of 1 forms covered">
-                097&nbsp;&nbsp;(defn&nbsp;READ
-                </span><br/>
-<span class="not-tracked" title="0 out of 0 forms covered">
-                098&nbsp;&nbsp;&nbsp;&nbsp;&quot;An&nbsp;implementation&nbsp;of&nbsp;a&nbsp;Lisp&nbsp;reader&nbsp;sufficient&nbsp;for&nbsp;bootstrapping;&nbsp;not&nbsp;necessarily
-                </span><br/>
-<span class="not-tracked" title="0 out of 0 forms covered">
-                099&nbsp;&nbsp;&nbsp;&nbsp;the&nbsp;final&nbsp;Lisp&nbsp;reader.&nbsp;`input`&nbsp;should&nbsp;be&nbsp;either&nbsp;a&nbsp;string&nbsp;representation&nbsp;of&nbsp;a&nbsp;LISP
-                </span><br/>
-<span class="not-tracked" title="0 out of 0 forms covered">
-                100&nbsp;&nbsp;&nbsp;&nbsp;expression,&nbsp;or&nbsp;else&nbsp;an&nbsp;input&nbsp;stream.&nbsp;A&nbsp;single&nbsp;form&nbsp;will&nbsp;be&nbsp;read.&quot;
-                </span><br/>
-<span class="not-tracked" title="0 out of 0 forms covered">
-                101&nbsp;&nbsp;&nbsp;&nbsp;([]
-                </span><br/>
-<span class="not-covered" title="0 out of 4 forms covered">
-                102&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(gsp&nbsp;(read-from-console)))
-                </span><br/>
-<span class="not-tracked" title="0 out of 0 forms covered">
-                103&nbsp;&nbsp;&nbsp;&nbsp;([input]
-                </span><br/>
-<span class="partial" title="2 out of 4 forms covered">
-                104&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(cond
-                </span><br/>
-<span class="partial" title="3 out of 5 forms covered">
-                105&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(empty?&nbsp;input)&nbsp;(READ)
                 </span><br/>
 <span class="covered" title="6 out of 6 forms covered">
-                106&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(string?&nbsp;input)&nbsp;(gsp&nbsp;input)
+                089&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(=&nbsp;(count&nbsp;(re-seq&nbsp;#&quot;\(&quot;&nbsp;r))
+                </span><br/>
+<span class="covered" title="5 out of 5 forms covered">
+                090&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(count&nbsp;(re-seq&nbsp;#&quot;\)&quot;&nbsp;r)))
+                </span><br/>
+<span class="covered" title="5 out of 5 forms covered">
+                091&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(=&nbsp;(count&nbsp;(re-seq&nbsp;#&quot;\[&quot;&nbsp;r))
+                </span><br/>
+<span class="covered" title="5 out of 5 forms covered">
+                092&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(count&nbsp;(re-seq&nbsp;#&quot;\]&quot;&nbsp;r))))
+                </span><br/>
+<span class="covered" title="1 out of 1 forms covered">
+                093&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;r
+                </span><br/>
+<span class="covered" title="1 out of 1 forms covered">
+                094&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(do
+                </span><br/>
+<span class="covered" title="6 out of 6 forms covered">
+                095&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(print&nbsp;(str&nbsp;p&nbsp;&quot;&nbsp;&quot;))
+                </span><br/>
+<span class="covered" title="2 out of 2 forms covered">
+                096&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(flush)
+                </span><br/>
+<span class="covered" title="1 out of 1 forms covered">
+                097&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(recur&nbsp;(str&nbsp;r&nbsp;&quot;\n&quot;&nbsp;(read-line))&nbsp;&quot;::&quot;)))))
+                </span><br/>
+<span class="blank" title="0 out of 0 forms covered">
+                098&nbsp;&nbsp;
+                </span><br/>
+<span class="covered" title="1 out of 1 forms covered">
+                099&nbsp;&nbsp;(defn&nbsp;read-from-console
+                </span><br/>
+<span class="not-tracked" title="0 out of 0 forms covered">
+                100&nbsp;&nbsp;&nbsp;&nbsp;&quot;Attempt&nbsp;to&nbsp;read&nbsp;a&nbsp;complete&nbsp;lisp&nbsp;expression&nbsp;from&nbsp;the&nbsp;console.
+                </span><br/>
+<span class="not-tracked" title="0 out of 0 forms covered">
+                101&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                </span><br/>
+<span class="not-tracked" title="0 out of 0 forms covered">
+                102&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;There&#x27;s&nbsp;a&nbsp;major&nbsp;problem&nbsp;here&nbsp;that&nbsp;the&nbsp;read-chars&nbsp;reader&nbsp;messes&nbsp;up&nbsp;testing.
+                </span><br/>
+<span class="not-tracked" title="0 out of 0 forms covered">
+                103&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;We&nbsp;need&nbsp;to&nbsp;be&nbsp;able&nbsp;to&nbsp;disable&nbsp;it&nbsp;while&nbsp;testing!&quot;
+                </span><br/>
+<span class="not-tracked" title="0 out of 0 forms covered">
+                104&nbsp;&nbsp;&nbsp;&nbsp;[prompt]
+                </span><br/>
+<span class="covered" title="4 out of 4 forms covered">
+                105&nbsp;&nbsp;&nbsp;&nbsp;(if&nbsp;(:testing&nbsp;*options*)
+                </span><br/>
+<span class="covered" title="3 out of 3 forms covered">
+                106&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(dummy-read-chars&nbsp;prompt)
+                </span><br/>
+<span class="not-covered" title="0 out of 3 forms covered">
+                107&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(read-chars&nbsp;prompt)))
+                </span><br/>
+<span class="blank" title="0 out of 0 forms covered">
+                108&nbsp;&nbsp;
+                </span><br/>
+<span class="covered" title="1 out of 1 forms covered">
+                109&nbsp;&nbsp;(defn&nbsp;READ
+                </span><br/>
+<span class="not-tracked" title="0 out of 0 forms covered">
+                110&nbsp;&nbsp;&nbsp;&nbsp;&quot;An&nbsp;implementation&nbsp;of&nbsp;a&nbsp;Lisp&nbsp;reader&nbsp;sufficient&nbsp;for&nbsp;bootstrapping;&nbsp;not&nbsp;necessarily
+                </span><br/>
+<span class="not-tracked" title="0 out of 0 forms covered">
+                111&nbsp;&nbsp;&nbsp;&nbsp;the&nbsp;final&nbsp;Lisp&nbsp;reader.&nbsp;`input`&nbsp;should&nbsp;be&nbsp;either&nbsp;a&nbsp;string&nbsp;representation&nbsp;of&nbsp;a&nbsp;LISP
+                </span><br/>
+<span class="not-tracked" title="0 out of 0 forms covered">
+                112&nbsp;&nbsp;&nbsp;&nbsp;expression,&nbsp;or&nbsp;else&nbsp;an&nbsp;input&nbsp;stream.&nbsp;A&nbsp;single&nbsp;form&nbsp;will&nbsp;be&nbsp;read.&quot;
+                </span><br/>
+<span class="not-tracked" title="0 out of 0 forms covered">
+                113&nbsp;&nbsp;&nbsp;&nbsp;([]
+                </span><br/>
+<span class="not-covered" title="0 out of 7 forms covered">
+                114&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(gsp&nbsp;(read-from-console&nbsp;(:prompt&nbsp;*options*))))
+                </span><br/>
+<span class="not-tracked" title="0 out of 0 forms covered">
+                115&nbsp;&nbsp;&nbsp;&nbsp;([input]
+                </span><br/>
+<span class="partial" title="2 out of 4 forms covered">
+                116&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(cond
+                </span><br/>
+<span class="partial" title="3 out of 5 forms covered">
+                117&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(empty?&nbsp;input)&nbsp;(READ)
+                </span><br/>
+<span class="covered" title="6 out of 6 forms covered">
+                118&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(string?&nbsp;input)&nbsp;(gsp&nbsp;input)
                 </span><br/>
 <span class="not-covered" title="0 out of 9 forms covered">
-                107&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(instance?&nbsp;InputStream&nbsp;input)&nbsp;(READ&nbsp;(slurp&nbsp;input))
+                119&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(instance?&nbsp;InputStream&nbsp;input)&nbsp;(READ&nbsp;(slurp&nbsp;input))
                 </span><br/>
 <span class="not-covered" title="0 out of 5 forms covered">
-                108&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:else&nbsp;&nbsp;&nbsp;&nbsp;(throw&nbsp;(ex-info&nbsp;&quot;READ:&nbsp;`input`&nbsp;should&nbsp;be&nbsp;a&nbsp;string&nbsp;or&nbsp;an&nbsp;input&nbsp;stream&quot;&nbsp;{})))))
+                120&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:else&nbsp;&nbsp;&nbsp;&nbsp;(throw&nbsp;(ex-info&nbsp;&quot;READ:&nbsp;`input`&nbsp;should&nbsp;be&nbsp;a&nbsp;string&nbsp;or&nbsp;an&nbsp;input&nbsp;stream&quot;&nbsp;{})))))
                 </span><br/>
  </body>
 </html>

docs/cloverage/beowulf/reader/char_reader.clj.html

@@ -71,163 +71,259 @@
                 022     https://stackoverflow.com/questions/7931988/how-to-manipulate-control-characters"
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                023&nbsp;&nbsp;&nbsp;&nbsp;;;&nbsp;(:import&nbsp;[org.jline.reader&nbsp;LineReader&nbsp;LineReaderBuilder]
+                023&nbsp;&nbsp;&nbsp;&nbsp;(:require&nbsp;[beowulf.oblist&nbsp;:refer&nbsp;[*options*&nbsp;oblist]])
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                024&nbsp;&nbsp;&nbsp;&nbsp;;;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[org.jline.terminal&nbsp;TerminalBuilder])
+                024&nbsp;&nbsp;&nbsp;&nbsp;(:import&nbsp;[org.jline.reader.impl.completer&nbsp;StringsCompleter]
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                025&nbsp;&nbsp;&nbsp;&nbsp;)
+                025&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[org.jline.reader.impl&nbsp;DefaultParser&nbsp;DefaultParser$Bracket]
+                </span><br/>
+<span class="not-tracked" title="0 out of 0 forms covered">
+                026&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[org.jline.reader&nbsp;LineReaderBuilder]
+                </span><br/>
+<span class="not-tracked" title="0 out of 0 forms covered">
+                027&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[org.jline.terminal&nbsp;TerminalBuilder]
+                </span><br/>
+<span class="not-tracked" title="0 out of 0 forms covered">
+                028&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[org.jline.widget&nbsp;AutopairWidgets&nbsp;AutosuggestionWidgets]))
                 </span><br/>
 <span class="blank" title="0 out of 0 forms covered">
-                026&nbsp;&nbsp;
+                029&nbsp;&nbsp;
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                027&nbsp;&nbsp;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+                030&nbsp;&nbsp;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                028&nbsp;&nbsp;;;;
+                031&nbsp;&nbsp;;;;
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                029&nbsp;&nbsp;;;;&nbsp;Copyright&nbsp;(C)&nbsp;2022-2023&nbsp;Simon&nbsp;Brooke
+                032&nbsp;&nbsp;;;;&nbsp;Copyright&nbsp;(C)&nbsp;2022-2023&nbsp;Simon&nbsp;Brooke
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                030&nbsp;&nbsp;;;;
+                033&nbsp;&nbsp;;;;
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                031&nbsp;&nbsp;;;;&nbsp;This&nbsp;program&nbsp;is&nbsp;free&nbsp;software;&nbsp;you&nbsp;can&nbsp;redistribute&nbsp;it&nbsp;and&#x2F;or
+                034&nbsp;&nbsp;;;;&nbsp;This&nbsp;program&nbsp;is&nbsp;free&nbsp;software;&nbsp;you&nbsp;can&nbsp;redistribute&nbsp;it&nbsp;and&#x2F;or
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                032&nbsp;&nbsp;;;;&nbsp;modify&nbsp;it&nbsp;under&nbsp;the&nbsp;terms&nbsp;of&nbsp;the&nbsp;GNU&nbsp;General&nbsp;Public&nbsp;License
+                035&nbsp;&nbsp;;;;&nbsp;modify&nbsp;it&nbsp;under&nbsp;the&nbsp;terms&nbsp;of&nbsp;the&nbsp;GNU&nbsp;General&nbsp;Public&nbsp;License
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                033&nbsp;&nbsp;;;;&nbsp;as&nbsp;published&nbsp;by&nbsp;the&nbsp;Free&nbsp;Software&nbsp;Foundation;&nbsp;either&nbsp;version&nbsp;2
+                036&nbsp;&nbsp;;;;&nbsp;as&nbsp;published&nbsp;by&nbsp;the&nbsp;Free&nbsp;Software&nbsp;Foundation;&nbsp;either&nbsp;version&nbsp;2
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                034&nbsp;&nbsp;;;;&nbsp;of&nbsp;the&nbsp;License,&nbsp;or&nbsp;(at&nbsp;your&nbsp;option)&nbsp;any&nbsp;later&nbsp;version.
+                037&nbsp;&nbsp;;;;&nbsp;of&nbsp;the&nbsp;License,&nbsp;or&nbsp;(at&nbsp;your&nbsp;option)&nbsp;any&nbsp;later&nbsp;version.
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                035&nbsp;&nbsp;;;;&nbsp;
+                038&nbsp;&nbsp;;;;&nbsp;
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                036&nbsp;&nbsp;;;;&nbsp;This&nbsp;program&nbsp;is&nbsp;distributed&nbsp;in&nbsp;the&nbsp;hope&nbsp;that&nbsp;it&nbsp;will&nbsp;be&nbsp;useful,
+                039&nbsp;&nbsp;;;;&nbsp;This&nbsp;program&nbsp;is&nbsp;distributed&nbsp;in&nbsp;the&nbsp;hope&nbsp;that&nbsp;it&nbsp;will&nbsp;be&nbsp;useful,
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                037&nbsp;&nbsp;;;;&nbsp;but&nbsp;WITHOUT&nbsp;ANY&nbsp;WARRANTY;&nbsp;without&nbsp;even&nbsp;the&nbsp;implied&nbsp;warranty&nbsp;of
+                040&nbsp;&nbsp;;;;&nbsp;but&nbsp;WITHOUT&nbsp;ANY&nbsp;WARRANTY;&nbsp;without&nbsp;even&nbsp;the&nbsp;implied&nbsp;warranty&nbsp;of
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                038&nbsp;&nbsp;;;;&nbsp;MERCHANTABILITY&nbsp;or&nbsp;FITNESS&nbsp;FOR&nbsp;A&nbsp;PARTICULAR&nbsp;PURPOSE.&nbsp;&nbsp;See&nbsp;the
+                041&nbsp;&nbsp;;;;&nbsp;MERCHANTABILITY&nbsp;or&nbsp;FITNESS&nbsp;FOR&nbsp;A&nbsp;PARTICULAR&nbsp;PURPOSE.&nbsp;&nbsp;See&nbsp;the
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                039&nbsp;&nbsp;;;;&nbsp;GNU&nbsp;General&nbsp;Public&nbsp;License&nbsp;for&nbsp;more&nbsp;details.
+                042&nbsp;&nbsp;;;;&nbsp;GNU&nbsp;General&nbsp;Public&nbsp;License&nbsp;for&nbsp;more&nbsp;details.
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                040&nbsp;&nbsp;;;;&nbsp;
+                043&nbsp;&nbsp;;;;&nbsp;
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                041&nbsp;&nbsp;;;;&nbsp;You&nbsp;should&nbsp;have&nbsp;received&nbsp;a&nbsp;copy&nbsp;of&nbsp;the&nbsp;GNU&nbsp;General&nbsp;Public&nbsp;License
+                044&nbsp;&nbsp;;;;&nbsp;You&nbsp;should&nbsp;have&nbsp;received&nbsp;a&nbsp;copy&nbsp;of&nbsp;the&nbsp;GNU&nbsp;General&nbsp;Public&nbsp;License
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                042&nbsp;&nbsp;;;;&nbsp;along&nbsp;with&nbsp;this&nbsp;program;&nbsp;if&nbsp;not,&nbsp;write&nbsp;to&nbsp;the&nbsp;Free&nbsp;Software
+                045&nbsp;&nbsp;;;;&nbsp;along&nbsp;with&nbsp;this&nbsp;program;&nbsp;if&nbsp;not,&nbsp;write&nbsp;to&nbsp;the&nbsp;Free&nbsp;Software
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                043&nbsp;&nbsp;;;;&nbsp;Foundation,&nbsp;Inc.,&nbsp;51&nbsp;Franklin&nbsp;Street,&nbsp;Fifth&nbsp;Floor,&nbsp;Boston,&nbsp;MA&nbsp;&nbsp;02110-1301,&nbsp;USA.
+                046&nbsp;&nbsp;;;;&nbsp;Foundation,&nbsp;Inc.,&nbsp;51&nbsp;Franklin&nbsp;Street,&nbsp;Fifth&nbsp;Floor,&nbsp;Boston,&nbsp;MA&nbsp;&nbsp;02110-1301,&nbsp;USA.
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                044&nbsp;&nbsp;;;;
+                047&nbsp;&nbsp;;;;
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                045&nbsp;&nbsp;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+                048&nbsp;&nbsp;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
                 </span><br/>
 <span class="blank" title="0 out of 0 forms covered">
-                046&nbsp;&nbsp;
+                049&nbsp;&nbsp;
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                047&nbsp;&nbsp;;;&nbsp;It&nbsp;looks&nbsp;from&nbsp;the&nbsp;example&nbsp;given&nbsp;[here](https:&#x2F;&#x2F;github.com&#x2F;jline&#x2F;jline3&#x2F;blob&#x2F;master&#x2F;demo&#x2F;src&#x2F;main&#x2F;java&#x2F;org&#x2F;jline&#x2F;demo&#x2F;Repl.java)
+                050&nbsp;&nbsp;;;&nbsp;It&nbsp;looks&nbsp;from&nbsp;the&nbsp;example&nbsp;given&nbsp;[here](https:&#x2F;&#x2F;github.com&#x2F;jline&#x2F;jline3&#x2F;blob&#x2F;master&#x2F;demo&#x2F;src&#x2F;main&#x2F;java&#x2F;org&#x2F;jline&#x2F;demo&#x2F;Repl.java)
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                048&nbsp;&nbsp;;;&nbsp;as&nbsp;though&nbsp;JLine&nbsp;could&nbsp;be&nbsp;used&nbsp;to&nbsp;build&nbsp;a&nbsp;perfect&nbsp;line-reader&nbsp;for&nbsp;Beowulf;&nbsp;but&nbsp;it&nbsp;also
+                051&nbsp;&nbsp;;;&nbsp;as&nbsp;though&nbsp;JLine&nbsp;could&nbsp;be&nbsp;used&nbsp;to&nbsp;build&nbsp;a&nbsp;perfect&nbsp;line-reader&nbsp;for&nbsp;Beowulf;&nbsp;but&nbsp;it&nbsp;also
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                049&nbsp;&nbsp;;;&nbsp;looks&nbsp;as&nbsp;though&nbsp;you&#x27;d&nbsp;need&nbsp;a&nbsp;DPhil&nbsp;in&nbsp;JLine&nbsp;to&nbsp;write&nbsp;it,&nbsp;and&nbsp;I&nbsp;don&#x27;t&nbsp;have
+                052&nbsp;&nbsp;;;&nbsp;looks&nbsp;as&nbsp;though&nbsp;you&#x27;d&nbsp;need&nbsp;a&nbsp;DPhil&nbsp;in&nbsp;JLine&nbsp;to&nbsp;write&nbsp;it,&nbsp;and&nbsp;I&nbsp;don&#x27;t&nbsp;have
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                050&nbsp;&nbsp;;;&nbsp;the&nbsp;time.
+                053&nbsp;&nbsp;;;&nbsp;the&nbsp;time.
                 </span><br/>
 <span class="blank" title="0 out of 0 forms covered">
-                051&nbsp;&nbsp;
+                054&nbsp;&nbsp;
+                </span><br/>
+<span class="covered" title="1 out of 1 forms covered">
+                055&nbsp;&nbsp;(defn&nbsp;build-completer
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                052&nbsp;&nbsp;;;&nbsp;(def&nbsp;get-reader
+                056&nbsp;&nbsp;&nbsp;&nbsp;&quot;Build&nbsp;a&nbsp;completer&nbsp;which&nbsp;takes&nbsp;tokens&nbsp;from&nbsp;the&nbsp;oblist.
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                053&nbsp;&nbsp;;;&nbsp;&nbsp;&nbsp;&quot;Return&nbsp;a&nbsp;reader,&nbsp;first&nbsp;constructing&nbsp;it&nbsp;if&nbsp;necessary.
+                057&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                054&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                058&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;This&nbsp;is&nbsp;sort-of&nbsp;working,&nbsp;in&nbsp;as&nbsp;much&nbsp;as&nbsp;hitting&nbsp;&lt;TAB&gt;&nbsp;on&nbsp;a&nbsp;blank&nbsp;line&nbsp;will&nbsp;
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                055&nbsp;&nbsp;;;&nbsp;&nbsp;&nbsp;&nbsp;**NOTE&nbsp;THAT**&nbsp;this&nbsp;is&nbsp;not&nbsp;settled&nbsp;API.&nbsp;The&nbsp;existence&nbsp;and&nbsp;call&nbsp;signature&nbsp;of
+                059&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;show&nbsp;a&nbsp;table&nbsp;of&nbsp;values&nbsp;from&nbsp;the&nbsp;oblist,&nbsp;but&nbsp;hitting&nbsp;&lt;TAB&gt;&nbsp;after&nbsp;you&#x27;ve&nbsp;
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                056&nbsp;&nbsp;;;&nbsp;&nbsp;&nbsp;&nbsp;this&nbsp;function&nbsp;is&nbsp;not&nbsp;guaranteed&nbsp;in&nbsp;future&nbsp;versions.&quot;
+                060&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;started&nbsp;input&nbsp;does&nbsp;not&nbsp;show&nbsp;potential&nbsp;completions&nbsp;for&nbsp;tokens&nbsp;you&#x27;ve&nbsp;started.&quot;
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                057&nbsp;&nbsp;;;&nbsp;&nbsp;&nbsp;(memoize&nbsp;(fn&nbsp;[]
+                061&nbsp;&nbsp;&nbsp;&nbsp;[]
                 </span><br/>
-<span class="not-tracked" title="0 out of 0 forms covered">
+<span class="not-covered" title="0 out of 12 forms covered">
-                058&nbsp;&nbsp;;;&nbsp;&nbsp;&nbsp;(let&nbsp;[term&nbsp;(.build&nbsp;(.system&nbsp;(TerminalBuilder&#x2F;builder)&nbsp;true))]
+                062&nbsp;&nbsp;&nbsp;&nbsp;(StringsCompleter.&nbsp;(map&nbsp;#(str&nbsp;(first&nbsp;%))&nbsp;@oblist)))
-                </span><br/>
-<span class="not-tracked" title="0 out of 0 forms covered">
-                059&nbsp;&nbsp;;;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(.build&nbsp;(.terminal&nbsp;(LineReaderBuilder&#x2F;builder)&nbsp;term))))))
                 </span><br/>
 <span class="blank" title="0 out of 0 forms covered">
-                060&nbsp;&nbsp;
+                063&nbsp;&nbsp;
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                061&nbsp;&nbsp;;;&nbsp;(defn&nbsp;read-chars
+                064&nbsp;&nbsp;;;&nbsp;This&nbsp;breaks;&nbsp;it&nbsp;is&nbsp;not&nbsp;correctly&nbsp;resolving&nbsp;the&nbsp;Enum,&nbsp;although&nbsp;I&nbsp;can&#x27;t&nbsp;work&nbsp;out
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                062&nbsp;&nbsp;;;&nbsp;&nbsp;&nbsp;&quot;A&nbsp;drop-in&nbsp;replacement&nbsp;for&nbsp;`clojure.core&#x2F;read-line`,&nbsp;except&nbsp;that&nbsp;line&nbsp;editing
+                065&nbsp;&nbsp;;;&nbsp;why&nbsp;not.
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                063&nbsp;&nbsp;;;&nbsp;&nbsp;&nbsp;&nbsp;and&nbsp;history&nbsp;should&nbsp;be&nbsp;enabled.
+                066&nbsp;&nbsp;;;&nbsp;(defn&nbsp;build-parser
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                064&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                067&nbsp;&nbsp;;;&nbsp;&nbsp;&nbsp;[]
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                065&nbsp;&nbsp;;;&nbsp;&nbsp;&nbsp;&nbsp;**NOTE&nbsp;THAT**&nbsp;this&nbsp;does&nbsp;not&nbsp;work&nbsp;yet,&nbsp;but&nbsp;it&nbsp;is&nbsp;in&nbsp;the&nbsp;API&nbsp;because&nbsp;I&nbsp;hope&nbsp;
+                068&nbsp;&nbsp;;;&nbsp;&nbsp;&nbsp;(println&nbsp;&quot;Building&nbsp;parser&quot;)
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                066&nbsp;&nbsp;;;&nbsp;&nbsp;&nbsp;&nbsp;that&nbsp;it&nbsp;will&nbsp;work&nbsp;later!&quot;
+                069&nbsp;&nbsp;;;&nbsp;&nbsp;&nbsp;(let&nbsp;[parser&nbsp;(DefaultParser.)]
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                067&nbsp;&nbsp;;;&nbsp;&nbsp;&nbsp;[]&nbsp;
+                070&nbsp;&nbsp;;;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(doall
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                068&nbsp;&nbsp;;;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;[eddie&nbsp;(get-reader)]
+                071&nbsp;&nbsp;;;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(.setEofOnUnclosedBracket&nbsp;
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                069&nbsp;&nbsp;;;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(loop&nbsp;[s&nbsp;(.readLine&nbsp;eddie)]
+                072&nbsp;&nbsp;;;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;parser&nbsp;DefaultParser$Bracket&#x2F;ROUND))))
+                </span><br/>
+<span class="blank" title="0 out of 0 forms covered">
+                073&nbsp;&nbsp;
+                </span><br/>
+<span class="covered" title="1 out of 1 forms covered">
+                074&nbsp;&nbsp;(def&nbsp;get-reader
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                070&nbsp;&nbsp;;;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(if&nbsp;(and&nbsp;(=&nbsp;(count&nbsp;(re-seq&nbsp;#&quot;\(&quot;&nbsp;s))
+                075&nbsp;&nbsp;&nbsp;&nbsp;&quot;Return&nbsp;a&nbsp;reader,&nbsp;first&nbsp;constructing&nbsp;it&nbsp;if&nbsp;necessary.
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                071&nbsp;&nbsp;;;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(count&nbsp;(re-seq&nbsp;#&quot;\)&quot;&nbsp;s)))
+                076&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                072&nbsp;&nbsp;;;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(=&nbsp;(count&nbsp;(re-seq&nbsp;#&quot;\[]&quot;&nbsp;s))
+                077&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;**NOTE&nbsp;THAT**&nbsp;this&nbsp;is&nbsp;not&nbsp;settled&nbsp;API.&nbsp;The&nbsp;existence&nbsp;and&nbsp;call&nbsp;signature&nbsp;of
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                073&nbsp;&nbsp;;;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(count&nbsp;(re-seq&nbsp;#&quot;\]&quot;&nbsp;s))))
+                078&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;this&nbsp;function&nbsp;is&nbsp;not&nbsp;guaranteed&nbsp;in&nbsp;future&nbsp;versions.&quot;
+                </span><br/>
+<span class="covered" title="3 out of 3 forms covered">
+                079&nbsp;&nbsp;&nbsp;&nbsp;(memoize&nbsp;(fn&nbsp;[]
+                </span><br/>
+<span class="not-covered" title="0 out of 5 forms covered">
+                080&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;[term&nbsp;(.build&nbsp;(.system&nbsp;(TerminalBuilder&#x2F;builder)&nbsp;true))
+                </span><br/>
+<span class="not-covered" title="0 out of 2 forms covered">
+                081&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;reader&nbsp;(-&gt;&nbsp;(LineReaderBuilder&#x2F;builder)
+                </span><br/>
+<span class="not-covered" title="0 out of 2 forms covered">
+                082&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(.terminal&nbsp;&nbsp;term)
+                </span><br/>
+<span class="not-covered" title="0 out of 3 forms covered">
+                083&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(.completer&nbsp;&nbsp;(build-completer))
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                074&nbsp;&nbsp;;;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;s
+                084&nbsp;&nbsp;&nbsp;;;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;#(.parser&nbsp;%&nbsp;(build-parser))
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                075&nbsp;&nbsp;;;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(recur&nbsp;(str&nbsp;s&nbsp;&quot;&nbsp;&quot;&nbsp;(.readLine&nbsp;eddie)))))))
+                085&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(.build))
+                </span><br/>
+<span class="not-tracked" title="0 out of 0 forms covered">
+                086&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;;;&nbsp;apw&nbsp;(AutopairWidgets.&nbsp;reader&nbsp;false)
+                </span><br/>
+<span class="not-tracked" title="0 out of 0 forms covered">
+                087&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;;;&nbsp;asw&nbsp;(AutosuggestionWidgets.&nbsp;reader)
+                </span><br/>
+<span class="not-tracked" title="0 out of 0 forms covered">
+                088&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;]
+                </span><br/>
+<span class="not-tracked" title="0 out of 0 forms covered">
+                089&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;;;&nbsp;(.enable&nbsp;apw)
+                </span><br/>
+<span class="not-tracked" title="0 out of 0 forms covered">
+                090&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;;;&nbsp;(.enable&nbsp;asw)
+                </span><br/>
+<span class="not-covered" title="0 out of 1 forms covered">
+                091&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;reader))))
+                </span><br/>
+<span class="blank" title="0 out of 0 forms covered">
+                092&nbsp;&nbsp;
+                </span><br/>
+<span class="covered" title="1 out of 1 forms covered">
+                093&nbsp;&nbsp;(defn&nbsp;read-chars
+                </span><br/>
+<span class="not-tracked" title="0 out of 0 forms covered">
+                094&nbsp;&nbsp;&nbsp;&nbsp;&quot;A&nbsp;drop-in&nbsp;replacement&nbsp;for&nbsp;`clojure.core&#x2F;read-line`,&nbsp;except&nbsp;that&nbsp;line&nbsp;editing
+                </span><br/>
+<span class="not-tracked" title="0 out of 0 forms covered">
+                095&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;and&nbsp;history&nbsp;should&nbsp;be&nbsp;enabled.
+                </span><br/>
+<span class="not-tracked" title="0 out of 0 forms covered">
+                096&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                </span><br/>
+<span class="not-tracked" title="0 out of 0 forms covered">
+                097&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;**NOTE&nbsp;THAT**&nbsp;this&nbsp;does&nbsp;not&nbsp;fully&nbsp;work&nbsp;yet,&nbsp;but&nbsp;it&nbsp;is&nbsp;in&nbsp;the&nbsp;API&nbsp;because&nbsp;I&nbsp;
+                </span><br/>
+<span class="not-tracked" title="0 out of 0 forms covered">
+                098&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;hope&nbsp;that&nbsp;it&nbsp;will&nbsp;work&nbsp;later!&quot;
+                </span><br/>
+<span class="not-tracked" title="0 out of 0 forms covered">
+                099&nbsp;&nbsp;&nbsp;&nbsp;[prompt]
+                </span><br/>
+<span class="not-covered" title="0 out of 3 forms covered">
+                100&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;[eddie&nbsp;(get-reader)]
+                </span><br/>
+<span class="not-covered" title="0 out of 6 forms covered">
+                101&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(loop&nbsp;[s&nbsp;(.readLine&nbsp;eddie&nbsp;(str&nbsp;prompt&nbsp;&quot;&nbsp;&quot;))]
+                </span><br/>
+<span class="not-covered" title="0 out of 12 forms covered">
+                102&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(if&nbsp;(and&nbsp;(=&nbsp;(count&nbsp;(re-seq&nbsp;#&quot;\(&quot;&nbsp;s))
+                </span><br/>
+<span class="not-covered" title="0 out of 5 forms covered">
+                103&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(count&nbsp;(re-seq&nbsp;#&quot;\)&quot;&nbsp;s)))
+                </span><br/>
+<span class="not-covered" title="0 out of 5 forms covered">
+                104&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(=&nbsp;(count&nbsp;(re-seq&nbsp;#&quot;\[]&quot;&nbsp;s))
+                </span><br/>
+<span class="not-covered" title="0 out of 5 forms covered">
+                105&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(count&nbsp;(re-seq&nbsp;#&quot;\]&quot;&nbsp;s))))
+                </span><br/>
+<span class="not-covered" title="0 out of 1 forms covered">
+                106&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;s
+                </span><br/>
+<span class="not-covered" title="0 out of 1 forms covered">
+                107&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(recur&nbsp;(str&nbsp;s&nbsp;&quot;&nbsp;&quot;&nbsp;(.readLine&nbsp;eddie&nbsp;&quot;::&nbsp;&quot;)))))))
                 </span><br/>
  </body>
 </html>

docs/cloverage/index.html

@@ -16,11 +16,11 @@
    </tr></thead>
 <tr>
  <td><a href="beowulf/bootstrap.clj.html">beowulf.bootstrap</a></td><td class="with-bar"><div class="covered"
-                                style="width:63.9344262295082%;
+                                style="width:64.03688524590164%;
-                                        float:left;"> 624 </div><div class="not-covered"
+                                        float:left;"> 625 </div><div class="not-covered"
-                                style="width:36.0655737704918%;
+                                style="width:35.96311475409836%;
-                                        float:left;"> 352 </div></td>
+                                        float:left;"> 351 </div></td>
-<td class="with-number">63.93 %</td>
+<td class="with-number">64.04 %</td>
 <td class="with-bar"><div class="covered"
                                 style="width:59.48275862068966%;
                                         float:left;"> 138 </div><div class="partial"
@@ -33,54 +33,54 @@
 </tr>
 <tr>
  <td><a href="beowulf/cons_cell.clj.html">beowulf.cons-cell</a></td><td class="with-bar"><div class="covered"
-                                style="width:72.34927234927235%;
+                                style="width:76.0914760914761%;
-                                        float:left;"> 348 </div><div class="not-covered"
+                                        float:left;"> 366 </div><div class="not-covered"
-                                style="width:27.65072765072765%;
+                                style="width:23.908523908523907%;
-                                        float:left;"> 133 </div></td>
+                                        float:left;"> 115 </div></td>
-<td class="with-number">72.35 %</td>
+<td class="with-number">76.09 %</td>
 <td class="with-bar"><div class="covered"
-                                style="width:75.17241379310344%;
+                                style="width:78.62068965517241%;
-                                        float:left;"> 109 </div><div class="partial"
+                                        float:left;"> 114 </div><div class="partial"
                                 style="width:6.206896551724138%;
                                         float:left;"> 9 </div><div class="not-covered"
-                                style="width:18.620689655172413%;
+                                style="width:15.172413793103448%;
-                                        float:left;"> 27 </div></td>
+                                        float:left;"> 22 </div></td>
-<td class="with-number">81.38 %</td>
+<td class="with-number">84.83 %</td>
 <td class="with-number">274</td><td class="with-number">23</td><td class="with-number">145</td>
 </tr>
 <tr>
  <td><a href="beowulf/core.clj.html">beowulf.core</a></td><td class="with-bar"><div class="covered"
-                                style="width:69.47368421052632%;
+                                style="width:73.94366197183099%;
-                                        float:left;"> 198 </div><div class="not-covered"
+                                        float:left;"> 210 </div><div class="not-covered"
-                                style="width:30.526315789473685%;
+                                style="width:26.056338028169016%;
-                                        float:left;"> 87 </div></td>
+                                        float:left;"> 74 </div></td>
-<td class="with-number">69.47 %</td>
+<td class="with-number">73.94 %</td>
 <td class="with-bar"><div class="covered"
-                                style="width:72.46376811594203%;
+                                style="width:78.26086956521739%;
-                                        float:left;"> 50 </div><div class="partial"
+                                        float:left;"> 54 </div><div class="partial"
-                                style="width:5.797101449275362%;
+                                style="width:2.898550724637681%;
-                                        float:left;"> 4 </div><div class="not-covered"
+                                        float:left;"> 2 </div><div class="not-covered"
-                                style="width:21.73913043478261%;
+                                style="width:18.840579710144926%;
-                                        float:left;"> 15 </div></td>
+                                        float:left;"> 13 </div></td>
-<td class="with-number">78.26 %</td>
+<td class="with-number">81.16 %</td>
 <td class="with-number">132</td><td class="with-number">6</td><td class="with-number">69</td>
 </tr>
 <tr>
  <td><a href="beowulf/host.clj.html">beowulf.host</a></td><td class="with-bar"><div class="covered"
-                                style="width:42.77384423157018%;
+                                style="width:56.44047135310849%;
-                                        float:left;"> 1027 </div><div class="not-covered"
+                                        float:left;"> 1389 </div><div class="not-covered"
-                                style="width:57.22615576842982%;
+                                style="width:43.55952864689151%;
-                                        float:left;"> 1374 </div></td>
+                                        float:left;"> 1072 </div></td>
-<td class="with-number">42.77 %</td>
+<td class="with-number">56.44 %</td>
 <td class="with-bar"><div class="covered"
-                                style="width:53.72549019607843%;
+                                style="width:75.37878787878788%;
-                                        float:left;"> 137 </div><div class="partial"
+                                        float:left;"> 199 </div><div class="partial"
-                                style="width:14.509803921568627%;
+                                style="width:12.121212121212121%;
-                                        float:left;"> 37 </div><div class="not-covered"
+                                        float:left;"> 32 </div><div class="not-covered"
-                                style="width:31.764705882352942%;
+                                style="width:12.5%;
-                                        float:left;"> 81 </div></td>
+                                        float:left;"> 33 </div></td>
-<td class="with-number">68.24 %</td>
+<td class="with-number">87.50 %</td>
-<td class="with-number">571</td><td class="with-number">66</td><td class="with-number">255</td>
+<td class="with-number">589</td><td class="with-number">67</td><td class="with-number">264</td>
 </tr>
 <tr>
  <td><a href="beowulf/interop.clj.html">beowulf.interop</a></td><td class="with-bar"><div class="covered"
@@ -107,14 +107,14 @@
                                         float:left;"> 181 </div></td>
 <td class="with-number">43.96 %</td>
 <td class="with-bar"><div class="covered"
-                                style="width:46.478873239436616%;
+                                style="width:45.833333333333336%;
                                         float:left;"> 33 </div><div class="partial"
-                                style="width:8.450704225352112%;
+                                style="width:8.333333333333334%;
                                         float:left;"> 6 </div><div class="not-covered"
-                                style="width:45.070422535211264%;
+                                style="width:45.833333333333336%;
-                                        float:left;"> 32 </div></td>
+                                        float:left;"> 33 </div></td>
-<td class="with-number">54.93 %</td>
+<td class="with-number">54.17 %</td>
-<td class="with-number">171</td><td class="with-number">12</td><td class="with-number">71</td>
+<td class="with-number">171</td><td class="with-number">12</td><td class="with-number">72</td>
 </tr>
 <tr>
  <td><a href="beowulf/manual.clj.html">beowulf.manual</a></td><td class="with-bar"><div class="covered"
@@ -134,7 +134,7 @@
 <tr>
  <td><a href="beowulf/oblist.clj.html">beowulf.oblist</a></td><td class="with-bar"><div class="covered"
                                 style="width:100.0%;
-                                        float:left;"> 9 </div></td>
+                                        float:left;"> 11 </div></td>
 <td class="with-number">100.00 %</td>
 <td class="with-bar"><div class="covered"
                                 style="width:100.0%;
@@ -144,31 +144,35 @@
 </tr>
 <tr>
  <td><a href="beowulf/read.clj.html">beowulf.read</a></td><td class="with-bar"><div class="covered"
-                                style="width:49.43181818181818%;
+                                style="width:54.36893203883495%;
-                                        float:left;"> 87 </div><div class="not-covered"
+                                        float:left;"> 112 </div><div class="not-covered"
-                                style="width:50.56818181818182%;
+                                style="width:45.63106796116505%;
-                                        float:left;"> 89 </div></td>
+                                        float:left;"> 94 </div></td>
-<td class="with-number">49.43 %</td>
+<td class="with-number">54.37 %</td>
 <td class="with-bar"><div class="covered"
-                                style="width:53.84615384615385%;
+                                style="width:61.702127659574465%;
-                                        float:left;"> 21 </div><div class="partial"
+                                        float:left;"> 29 </div><div class="partial"
-                                style="width:7.6923076923076925%;
+                                style="width:6.382978723404255%;
                                         float:left;"> 3 </div><div class="not-covered"
-                                style="width:38.46153846153846%;
+                                style="width:31.914893617021278%;
                                         float:left;"> 15 </div></td>
-<td class="with-number">61.54 %</td>
+<td class="with-number">68.09 %</td>
-<td class="with-number">108</td><td class="with-number">9</td><td class="with-number">39</td>
+<td class="with-number">120</td><td class="with-number">10</td><td class="with-number">47</td>
 </tr>
 <tr>
  <td><a href="beowulf/reader/char_reader.clj.html">beowulf.reader.char-reader</a></td><td class="with-bar"><div class="covered"
-                                style="width:100.0%;
+                                style="width:10.0%;
-                                        float:left;"> 1 </div></td>
+                                        float:left;"> 7 </div><div class="not-covered"
-<td class="with-number">100.00 %</td>
+                                style="width:90.0%;
+                                        float:left;"> 63 </div></td>
+<td class="with-number">10.00 %</td>
 <td class="with-bar"><div class="covered"
-                                style="width:100.0%;
+                                style="width:26.31578947368421%;
-                                        float:left;"> 1 </div></td>
+                                        float:left;"> 5 </div><div class="not-covered"
-<td class="with-number">100.00 %</td>
+                                style="width:73.6842105263158%;
-<td class="with-number">75</td><td class="with-number">4</td><td class="with-number">1</td>
+                                        float:left;"> 14 </div></td>
+<td class="with-number">26.32 %</td>
+<td class="with-number">107</td><td class="with-number">6</td><td class="with-number">19</td>
 </tr>
 <tr>
  <td><a href="beowulf/reader/generate.clj.html">beowulf.reader.generate</a></td><td class="with-bar"><div class="covered"
@@ -232,9 +236,9 @@
 </tr>
 <tr><td>Totals:</td>
 <td class="with-bar"></td>
-<td class="with-number">64.63 %</td>
+<td class="with-number">68.60 %</td>
 <td class="with-bar"></td>
-<td class="with-number">74.41 %</td>
+<td class="with-number">77.76 %</td>
    </tr>
   </table>
  </body>

docs/codox/further_reading.html

@@ -1,17 +1,19 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>Further Reading</title><link rel="icon" type="image/x-icon" href="../img/beowulf_logo_favicon.png" /><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="css/highlight.css" /><script type="text/javascript" src="js/highlight.min.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a></h2><h1><a href="index.html"><span class="project-title"><span class="project-name">Beowulf</span> <span class="project-version">0.3.0</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1  current"><a href="further_reading.html"><div class="inner"><span>Further Reading</span></div></a></li><li class="depth-1 "><a href="intro.html"><div class="inner"><span>beowulf</span></div></a></li><li class="depth-1 "><a href="mexpr.html"><div class="inner"><span>Interpreting M-Expressions</span></div></a></li><li class="depth-1 "><a href="values.html"><div class="inner"><span>The properties of the system, and their values</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>beowulf</span></div></div></li><li class="depth-2 branch"><a href="beowulf.bootstrap.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>bootstrap</span></div></a></li><li class="depth-2 branch"><a href="beowulf.cons-cell.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>cons-cell</span></div></a></li><li class="depth-2 branch"><a href="beowulf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="beowulf.gendoc.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>gendoc</span></div></a></li><li class="depth-2 branch"><a href="beowulf.host.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>host</span></div></a></li><li class="depth-2 branch"><a href="beowulf.interop.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>interop</span></div></a></li><li class="depth-2 branch"><a href="beowulf.io.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>io</span></div></a></li><li class="depth-2 branch"><a href="beowulf.manual.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>manual</span></div></a></li><li class="depth-2 branch"><a href="beowulf.oblist.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>oblist</span></div></a></li><li class="depth-2 branch"><a href="beowulf.read.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>read</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>reader</span></div></div></li><li class="depth-3 branch"><a href="beowulf.reader.char-reader.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>char-reader</span></div></a></li><li class="depth-3 branch"><a href="beowulf.reader.generate.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>generate</span></div></a></li><li class="depth-3 branch"><a href="beowulf.reader.macros.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>macros</span></div></a></li><li class="depth-3 branch"><a href="beowulf.reader.parser.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>parser</span></div></a></li><li class="depth-3"><a href="beowulf.reader.simplify.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>simplify</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#further-reading" name="further-reading"></a>Further Reading</h1>
+<html><head><meta charset="UTF-8" /><title>Further Reading</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="css/highlight.css" /><link rel="icon" type="image/x-icon" href="../img/beowulf_logo_favicon.png" /></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a></h2><h1><a href="index.html"><span class="project-title"><span class="project-name">Beowulf</span> <span class="project-version">0.3.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1  current"><a href="further_reading.html"><div class="inner"><span>Further Reading</span></div></a></li><li class="depth-1 "><a href="intro.html"><div class="inner"><span>beowulf</span></div></a></li><li class="depth-1 "><a href="mexpr.html"><div class="inner"><span>Interpreting M-Expressions</span></div></a></li><li class="depth-1 "><a href="values.html"><div class="inner"><span>The properties of the system, and their values</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>beowulf</span></div></div></li><li class="depth-2 branch"><a href="beowulf.bootstrap.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>bootstrap</span></div></a></li><li class="depth-2 branch"><a href="beowulf.cons-cell.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>cons-cell</span></div></a></li><li class="depth-2 branch"><a href="beowulf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="beowulf.gendoc.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>gendoc</span></div></a></li><li class="depth-2 branch"><a href="beowulf.host.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>host</span></div></a></li><li class="depth-2 branch"><a href="beowulf.interop.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>interop</span></div></a></li><li class="depth-2 branch"><a href="beowulf.io.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>io</span></div></a></li><li class="depth-2 branch"><a href="beowulf.manual.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>manual</span></div></a></li><li class="depth-2 branch"><a href="beowulf.oblist.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>oblist</span></div></a></li><li class="depth-2 branch"><a href="beowulf.read.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>read</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>reader</span></div></div></li><li class="depth-3 branch"><a href="beowulf.reader.char-reader.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>char-reader</span></div></a></li><li class="depth-3 branch"><a href="beowulf.reader.generate.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>generate</span></div></a></li><li class="depth-3 branch"><a href="beowulf.reader.macros.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>macros</span></div></a></li><li class="depth-3 branch"><a href="beowulf.reader.parser.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>parser</span></div></a></li><li class="depth-3"><a href="beowulf.reader.simplify.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>simplify</span></div></a></li><li class="depth-2"><a href="beowulf.scratch.html"><div class="inner"><span class="tree" style="top: -176px;"><span class="top" style="height: 185px;"></span><span class="bottom"></span></span><span>scratch</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#further-reading" id="further-reading"></a>Further Reading</h1>
 <ol>
-  <li><a href="http://bitsavers.org/pdf/mit/computer_center/Coding_for_the_MIT-IBM_704_Computer_Oct57.pdf">CODING for the MIT-IBM 704 COMPUTER, October 1957</a> This paper is not about Lisp. But it is about the particular individual computer on which Lisp was first implemented, and it is written in part by members of the Lisp team. I have found it useful in understanding the software environment in which, and the constraints under which, Lisp was written.</li>
+<li><a href="http://bitsavers.org/pdf/mit/computer_center/Coding_for_the_MIT-IBM_704_Computer_Oct57.pdf">CODING for the MIT-IBM 704 COMPUTER, October 1957</a> This paper is not about Lisp. But it is about the particular individual computer on which Lisp was first implemented, and it is written in part by members of the Lisp team. I have found it useful in understanding the software environment in which, and the constraints under which, Lisp was written.</li>
-  <li><a href="https://www.softwarepreservation.org/projects/LISP/MIT/AIM-001.pdf">MIT AI Memo 1, John McCarthy, September 1958</a> This is, as far as I can find, the earliest specification document of the Lisp project.</li>
+<li><a href="https://www.softwarepreservation.org/projects/LISP/MIT/AIM-001.pdf">MIT AI Memo 1, John McCarthy, September 1958</a> This is, as far as I can find, the earliest specification document of the Lisp project.</li>
-  <li><a href="https://bitsavers.org/pdf/mit/rle_lisp/LISP_I_Programmers_Manual_Mar60.pdf">Lisp 1 Programmer’s Manual, Phyllis Fox, March 1960</a></li>
+<li><a href="https://bitsavers.org/pdf/mit/rle_lisp/LISP_I_Programmers_Manual_Mar60.pdf">Lisp 1 Programmer’s Manual, Phyllis Fox, March 1960</a></li>
-  <li><a href="https://www.softwarepreservation.org/projects/LISP/book/LISP%201.5%20Programmers%20Manual.pdf#page=81">Lisp 1.5 Programmer’s Manual, Michael I. Levin, August 1962</a> This book is essential reading: it documents in some detail the first fully realised Lisp language system.</li>
+<li><a href="https://www.softwarepreservation.org/projects/LISP/book/LISP%201.5%20Programmers%20Manual.pdf#page=81">Lisp 1.5 Programmer’s Manual, Michael I. Levin, August 1962</a> This book is essential reading: it documents in some detail the first fully realised Lisp language system.</li>
-  <li><a href="https://dl.acm.org/doi/pdf/10.1145/800055.802047#page=3">Early LISP History (1956 - 1959), Herbert Stoyan, August 1984</a></li>
+<li><a href="https://dl.acm.org/doi/pdf/10.1145/800055.802047#page=3">Early LISP History (1956 - 1959), Herbert Stoyan, August 1984</a></li>
-  <li>
+<li>
-  <p><a href="http://www.paulgraham.com/rootsoflisp.html">The Roots of Lisp, Paul Graham, 2001</a></p></li>
+<p><a href="http://www.paulgraham.com/rootsoflisp.html">The Roots of Lisp, Paul Graham, 2001</a></p>
-  <li>
+</li>
-  <p><a href="http://www.paulgraham.com/icad.html">The Revenge of the Nerds, Paul Graham, 2002</a> This is mainly about why to use Lisp as a language for modern commercial software, but has useful insights into where it comes from.</p>
+<li><a href="http://www.paulgraham.com/icad.html">The Revenge of the Nerds, Paul Graham, 2002</a> This is mainly about why to use Lisp as a language for modern commercial software, but has useful insights into where it comes from.
-  <blockquote>
+<blockquote>
-    <p>So the short explanation of why this 1950s language is not obsolete is that it was not technology but math, and math doesn’t get stale.</p>
+<p>So the short explanation of why this 1950s language is not obsolete is that it was not technology but math, and math doesn’t get stale.</p>
-  </blockquote></li>
+</blockquote>
-</ol></div></div></div></body></html>
+</li>
+</ol>
+</div></div></div></body></html>

docs/codox/intro.html

@@ -1,14 +1,242 @@
-<html>
+<!DOCTYPE html PUBLIC ""
-  <head>
+    "">
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<html><head><meta charset="UTF-8" /><title>beowulf</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="css/highlight.css" /><link rel="icon" type="image/x-icon" href="../img/beowulf_logo_favicon.png" /></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a></h2><h1><a href="index.html"><span class="project-title"><span class="project-name">Beowulf</span> <span class="project-version">0.3.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="further_reading.html"><div class="inner"><span>Further Reading</span></div></a></li><li class="depth-1  current"><a href="intro.html"><div class="inner"><span>beowulf</span></div></a></li><li class="depth-1 "><a href="mexpr.html"><div class="inner"><span>Interpreting M-Expressions</span></div></a></li><li class="depth-1 "><a href="values.html"><div class="inner"><span>The properties of the system, and their values</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>beowulf</span></div></div></li><li class="depth-2 branch"><a href="beowulf.bootstrap.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>bootstrap</span></div></a></li><li class="depth-2 branch"><a href="beowulf.cons-cell.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>cons-cell</span></div></a></li><li class="depth-2 branch"><a href="beowulf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="beowulf.gendoc.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>gendoc</span></div></a></li><li class="depth-2 branch"><a href="beowulf.host.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>host</span></div></a></li><li class="depth-2 branch"><a href="beowulf.interop.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>interop</span></div></a></li><li class="depth-2 branch"><a href="beowulf.io.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>io</span></div></a></li><li class="depth-2 branch"><a href="beowulf.manual.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>manual</span></div></a></li><li class="depth-2 branch"><a href="beowulf.oblist.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>oblist</span></div></a></li><li class="depth-2 branch"><a href="beowulf.read.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>read</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>reader</span></div></div></li><li class="depth-3 branch"><a href="beowulf.reader.char-reader.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>char-reader</span></div></a></li><li class="depth-3 branch"><a href="beowulf.reader.generate.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>generate</span></div></a></li><li class="depth-3 branch"><a href="beowulf.reader.macros.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>macros</span></div></a></li><li class="depth-3 branch"><a href="beowulf.reader.parser.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>parser</span></div></a></li><li class="depth-3"><a href="beowulf.reader.simplify.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>simplify</span></div></a></li><li class="depth-2"><a href="beowulf.scratch.html"><div class="inner"><span class="tree" style="top: -176px;"><span class="top" style="height: 185px;"></span><span class="bottom"></span></span><span>scratch</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#beowulf" id="beowulf"></a>beowulf</h1>
-    <title>Beowulf: Documentation</title>
+<h2><a href="#þý-liste-cræfte-spræc" id="þý-liste-cræfte-spræc"></a>Þý liste cræfte spræc</h2>
-    <link rel="stylesheet" type="text/css" href="codox/css/default.css" />
+<p>LISP 1.5 is to all Lisp dialects as Beowulf is to English literature.</p>
-  </head>
+<p><img src="https://simon-brooke.github.io/beowulf/docs/img/beowulf_logo_med.png" alt="Beowulf logo" /></p>
-  <body>
+<h2><a href="#contents" id="contents"></a>Contents</h2>
-    <h1>Beowulf: Documentation</h1>
+<ul>
-    <ul>
+<li><a href="#what-this-is">What this is</a>
-      <li><a href="codox/index.html">Primary documentaion</a></li>
+<ul>
-      <li><a href="cloverage/index.html">Test coverage</a></li>
+<li><a href="#status">Status</a></li>
-    </ul>
+<li><a href="#but-why-----">BUT WHY?!!?!</a></li>
-  </body>
+<li><a href="#project-target">Project Target</a></li>
-</html>
+<li><a href="#invoking">Invoking</a></li>
+<li><a href="#building-and-invoking">Building and Invoking</a></li>
+<li><a href="#reader-macros">Reader macros</a></li>
+<li><a href="#functions-and-symbols-implemented">Functions and symbols implemented</a></li>
+<li><a href="#architectural-plan">Architectural plan</a></li>
+<li><a href="#resources-lisp15lsp">resources/lisp1.5.lsp</a></li>
+<li><a href="#beowulf-boostrapclj">beowulf/boostrap.clj</a></li>
+<li><a href="#beowulf-hostclj">beowulf/host.clj</a></li>
+<li><a href="#beowulf-readclj">beowulf/read.clj</a></li>
+<li><a href="#commentary">Commentary</a></li>
+</ul>
+</li>
+<li><a href="#installation">Installation</a>
+<ul>
+<li><a href="#input-output">Input/output</a></li>
+<li><a href="#sysout">SYSOUT</a></li>
+<li><a href="#sysin">SYSIN</a></li>
+</ul>
+</li>
+<li><a href="#learning-lisp-15">Learning Lisp 1.5</a></li>
+<li><a href="#other-lisp-15-resources">Other Lisp 1.5 resources</a>
+<ul>
+<li><a href="#other-implementations">Other implmentations</a></li>
+<li><a href="#history-resources">History resources</a></li>
+</ul>
+</li>
+<li><a href="#license">License</a></li>
+</ul>
+<p><small><i><a href="http://ecotrust-canada.github.io/markdown-toc/">Table of contents generated with markdown-toc</a></i></small></p>
+<h2><a href="#what-this-is" id="what-this-is"></a>What this is</h2>
+<p>A work-in-progress towards an implementation of Lisp 1.5 in Clojure. The objective is to build a complete and accurate implementation of Lisp 1.5 as described in the manual, with, in so far as is possible, exactly the same bahaviour - except as documented below.</p>
+<h3><a href="#but-why" id="but-why"></a>BUT WHY?!!?!</h3>
+<p>Because.</p>
+<p>Because Lisp is the only computer language worth learning, and if a thing is worth learning, it’s worth learning properly; which means going back to the beginning and trying to understand that.</p>
+<p>Because there is, so far as I know, no working implementation of Lisp 1.5 for modern machines.</p>
+<p>Because I’m barking mad, and this is therapy.</p>
+<h3><a href="#status" id="status"></a>Status</h3>
+<p>Working Lisp interpreter, but some key features not yet implemented.</p>
+<ul>
+<li><a href="https://simon-brooke.github.io/beowulf/">Project website</a>.</li>
+<li><a href="https://simon-brooke.github.io/beowulf/docs/codox/index.html">Source code documentation</a>.</li>
+</ul>
+<h3><a href="#project-target" id="project-target"></a>Project Target</h3>
+<p>The project target is to be able to run the <a href="https://www.softwarepreservation.org/projects/LISP/book/LISP%201.5%20Programmers%20Manual.pdf#page=52">Wang algorithm for the propositional calculus</a> given in chapter 8 of the <em>Lisp 1.5 Programmer’s Manual</em>. When that runs, the project is as far as I am concerned feature complete. I may keep tinkering with it after that and I’ll certainly accept pull requests which are in the spirit of the project (i.e. making Beowulf more usable, and/or implementing parts of Lisp 1.5 which I have not implemented), but this isn’t intended to be a new language for doing real work; it’s an educational and archaeological project, not serious engineering.</p>
+<p>Some <code>readline</code>-like functionality would be really useful, but my attempt to integrate <a href="https://github.com/jline/jline3">JLine</a> has not (yet) been successful.</p>
+<p>An in-core structure editor would be an extremely nice thing, and I may well implement one.</p>
+<p>You are of course welcome to fork the project and do whatever you like with it!</p>
+<h3><a href="#invoking" id="invoking"></a>Invoking</h3>
+<p>Invoke with</p>
+<pre><code>java -jar target/uberjar/beowulf-0.3.0-standalone.jar --help
+</code></pre>
+<p>(Obviously, check your version number)</p>
+<p>Command line arguments as follows:</p>
+<pre><code>  -h, --help                               Print this message
+  -p PROMPT, --prompt PROMPT               Set the REPL prompt to PROMPT
+  -r INITFILE, --read SYSOUTFILE           Read Lisp sysout from the file SYSOUTFILE 
+                                           (defaults to `resources/lisp1.5.lsp`)
+  -s, --strict                             Strictly interpret the Lisp 1.5 language, 
+                                           without extensions.
+</code></pre>
+<p>To end a session, type <code>STOP</code> at the command prompt.</p>
+<h3><a href="#building-and-invoking" id="building-and-invoking"></a>Building and Invoking</h3>
+<p>Build with</p>
+<pre><code>lein uberjar
+</code></pre>
+<h3><a href="#reader-macros" id="reader-macros"></a>Reader macros</h3>
+<p>Currently <code>SETQ</code> and <code>DEFUN</code> are implemented as reader macros, sort of. It would now be possible to reimplement them as <code>FEXPRs</code> and so the reader macro functionality will probably go away.</p>
+<h3><a href="#functions-and-symbols-implemented" id="functions-and-symbols-implemented"></a>Functions and symbols implemented</h3>
+<table>
+<thead>
+<tr><th> Function     </th><th> Type           </th><th> Signature        </th><th> Implementation </th><th> Documentation        </th></tr>
+</thead>
+<tbody>
+<tr><td> NIL          </td><td> Lisp variable  </td><td> ?                </td><td>                </td><td> see manual pages <a href="#page22">22</a>, <a href="#page69">69</a> </td></tr>
+<tr><td> T            </td><td> Lisp variable  </td><td> ?                </td><td>                </td><td> see manual pages <a href="#page22">22</a>, <a href="#page69">69</a> </td></tr>
+<tr><td> F            </td><td> Lisp variable  </td><td> ?                </td><td>                </td><td> see manual pages <a href="#page22">22</a>, <a href="#page69">69</a> </td></tr>
+<tr><td> ADD1         </td><td> Host lambda function </td><td> ?                </td><td>                </td><td> ?                    </td></tr>
+<tr><td> AND          </td><td> Host lambda function </td><td> ?                </td><td> PREDICATE      </td><td> <code>T</code> if and only if none of my <code>args</code> evaluate to either <code>F</code> or <code>NIL</code>,    else <code>F</code>.        In <code>beowulf.host</code> principally because I don’t yet feel confident to define    varargs functions in Lisp. </td></tr>
+<tr><td> APPEND       </td><td> Lisp lambda function </td><td> ?                </td><td>                </td><td> see manual pages <a href="#page11">11</a>, <a href="#page61">61</a> </td></tr>
+<tr><td> APPLY        </td><td> Host lambda function </td><td> ?                </td><td>                </td><td> Apply this <code>function</code> to these <code>arguments</code> in this <code>environment</code> and return    the result.        For bootstrapping, at least, a version of APPLY written in Clojure.    All args are assumed to be symbols or <code>beowulf.cons-cell/ConsCell</code> objects.    See page 13 of the Lisp 1.5 Programmers Manual. </td></tr>
+<tr><td> ASSOC        </td><td> Lisp lambda function, Host lambda function </td><td> ?                </td><td> ?              </td><td> If a is an association list such as the one formed by PAIRLIS in the above   example, then assoc will produce the first pair whose first term is x. Thus   it is a table searching function.    All args are assumed to be <code>beowulf.cons-cell/ConsCell</code> objects.   See page 12 of the Lisp 1.5 Programmers Manual.        <strong>NOTE THAT</strong> this function is overridden by an implementation in Lisp,    but is currently still present for bootstrapping. </td></tr>
+<tr><td> ATOM         </td><td> Host lambda function </td><td> ?                </td><td> PREDICATE      </td><td> Returns <code>T</code> if and only if the argument <code>x</code> is bound to an atom; else <code>F</code>.   It is not clear to me from the documentation whether <code>(ATOM 7)</code> should return   <code>T</code> or <code>F</code>. I’m going to assume <code>T</code>. </td></tr>
+<tr><td> CAR          </td><td> Host lambda function </td><td> ?                </td><td>                </td><td> Return the item indicated by the first pointer of a pair. NIL is treated   specially: the CAR of NIL is NIL. </td></tr>
+<tr><td> CAAAAR       </td><td> Lisp lambda function </td><td> ?                </td><td> ?              </td><td> ?                    </td></tr>
+<tr><td> CAAADR       </td><td> Lisp lambda function </td><td> ?                </td><td> ?              </td><td> ?                    </td></tr>
+<tr><td> CAAAR        </td><td> Lisp lambda function </td><td> ?                </td><td> ?              </td><td> ?                    </td></tr>
+<tr><td> CAADAR       </td><td> Lisp lambda function </td><td> ?                </td><td> ?              </td><td> ?                    </td></tr>
+<tr><td> CAADDR       </td><td> Lisp lambda function </td><td> ?                </td><td> ?              </td><td> ?                    </td></tr>
+<tr><td> CAADR        </td><td> Lisp lambda function </td><td> ?                </td><td> ?              </td><td> ?                    </td></tr>
+<tr><td> CAAR         </td><td> Lisp lambda function </td><td> ?                </td><td> ?              </td><td> ?                    </td></tr>
+<tr><td> CADAAR       </td><td> Lisp lambda function </td><td> ?                </td><td> ?              </td><td> ?                    </td></tr>
+<tr><td> CADADR       </td><td> Lisp lambda function </td><td> ?                </td><td> ?              </td><td> ?                    </td></tr>
+<tr><td> CADAR        </td><td> Lisp lambda function </td><td> ?                </td><td> ?              </td><td> ?                    </td></tr>
+<tr><td> CADDAR       </td><td> Lisp lambda function </td><td> ?                </td><td> ?              </td><td> ?                    </td></tr>
+<tr><td> CADDDR       </td><td> Lisp lambda function </td><td> ?                </td><td> ?              </td><td> ?                    </td></tr>
+<tr><td> CADDR        </td><td> Lisp lambda function </td><td> ?                </td><td> ?              </td><td> ?                    </td></tr>
+<tr><td> CADR         </td><td> Lisp lambda function </td><td> ?                </td><td> ?              </td><td> ?                    </td></tr>
+<tr><td> CDAAAR       </td><td> Lisp lambda function </td><td> ?                </td><td> ?              </td><td> ?                    </td></tr>
+<tr><td> CDAADR       </td><td> Lisp lambda function </td><td> ?                </td><td> ?              </td><td> ?                    </td></tr>
+<tr><td> CDAAR        </td><td> Lisp lambda function </td><td> ?                </td><td> ?              </td><td> ?                    </td></tr>
+<tr><td> CDADAR       </td><td> Lisp lambda function </td><td> ?                </td><td> ?              </td><td> ?                    </td></tr>
+<tr><td> CDADDR       </td><td> Lisp lambda function </td><td> ?                </td><td> ?              </td><td> ?                    </td></tr>
+<tr><td> CDADR        </td><td> Lisp lambda function </td><td> ?                </td><td> ?              </td><td> ?                    </td></tr>
+<tr><td> CDAR         </td><td> Lisp lambda function </td><td> ?                </td><td> ?              </td><td> ?                    </td></tr>
+<tr><td> CDDAAR       </td><td> Lisp lambda function </td><td> ?                </td><td> ?              </td><td> ?                    </td></tr>
+<tr><td> CDDADR       </td><td> Lisp lambda function </td><td> ?                </td><td> ?              </td><td> ?                    </td></tr>
+<tr><td> CDDAR        </td><td> Lisp lambda function </td><td> ?                </td><td> ?              </td><td> ?                    </td></tr>
+<tr><td> CDDDAR       </td><td> Lisp lambda function </td><td> ?                </td><td> ?              </td><td> ?                    </td></tr>
+<tr><td> CDDDDR       </td><td> Lisp lambda function </td><td> ?                </td><td> ?              </td><td> ?                    </td></tr>
+<tr><td> CDDDR        </td><td> Lisp lambda function </td><td> ?                </td><td> ?              </td><td> ?                    </td></tr>
+<tr><td> CDDR         </td><td> Lisp lambda function </td><td> ?                </td><td> ?              </td><td> ?                    </td></tr>
+<tr><td> CDR          </td><td> Host lambda function </td><td> ?                </td><td>                </td><td> Return the item indicated by the second pointer of a pair. NIL is treated   specially: the CDR of NIL is NIL. </td></tr>
+<tr><td> CONS         </td><td> Host lambda function </td><td> ?                </td><td>                </td><td> Construct a new instance of cons cell with this <code>car</code> and <code>cdr</code>. </td></tr>
+<tr><td> CONSP        </td><td> Host lambda function </td><td> ?                </td><td> ?              </td><td> Return <code>T</code> if object <code>o</code> is a cons cell, else <code>F</code>.        <strong>NOTE THAT</strong> this is an extension function, not available in strct mode.     I believe that Lisp 1.5 did not have any mechanism for testing whether an    argument was, or was not, a cons cell. </td></tr>
+<tr><td> COPY         </td><td> Lisp lambda function </td><td> ?                </td><td>                </td><td> see manual pages <a href="#page62">62</a> </td></tr>
+<tr><td> DEFINE       </td><td> Host lambda function </td><td> ?                </td><td> PSEUDO-FUNCTION </td><td> Bootstrap-only version of <code>DEFINE</code> which, post boostrap, can be overwritten    in LISP.     The single argument to <code>DEFINE</code> should be an association list of symbols to    lambda functions. See page 58 of the manual. </td></tr>
+<tr><td> DIFFERENCE   </td><td> Host lambda function </td><td> ?                </td><td>                </td><td> ?                    </td></tr>
+<tr><td> DIVIDE       </td><td> Lisp lambda function </td><td> ?                </td><td>                </td><td> see manual pages <a href="#page26">26</a>, <a href="#page64">64</a> </td></tr>
+<tr><td> DOC          </td><td> Host lambda function </td><td> ?                </td><td> ?              </td><td> Open the page for this <code>symbol</code> in the Lisp 1.5 manual, if known, in the      default web browser.        <strong>NOTE THAT</strong> this is an extension function, not available in strct mode. </td></tr>
+<tr><td> EFFACE       </td><td> Lisp lambda function </td><td> ?                </td><td> PSEUDO-FUNCTION </td><td> see manual pages <a href="#page63">63</a> </td></tr>
+<tr><td> ERROR        </td><td> Host lambda function </td><td> ?                </td><td> PSEUDO-FUNCTION </td><td> Throw an error       </td></tr>
+<tr><td> EQ           </td><td> Host lambda function </td><td> ?                </td><td> PREDICATE      </td><td> Returns <code>T</code> if and only if both <code>x</code> and <code>y</code> are bound to the same atom,   else <code>NIL</code>. </td></tr>
+<tr><td> EQUAL        </td><td> Host lambda function </td><td> ?                </td><td> PREDICATE      </td><td> This is a predicate that is true if its two arguments are identical   S-expressions, and false if they are different. (The elementary predicate   <code>EQ</code> is defined only for atomic arguments.) The definition of <code>EQUAL</code> is   an example of a conditional expression inside a conditional expression.    NOTE: returns <code>F</code> on failure, not <code>NIL</code> </td></tr>
+<tr><td> EVAL         </td><td> Host lambda function </td><td> ?                </td><td>                </td><td> Evaluate this <code>expr</code> and return the result. If <code>environment</code> is not passed,    it defaults to the current value of the global object list. The <code>depth</code>    argument is part of the tracing system and should not be set by user code.     All args are assumed to be numbers, symbols or <code>beowulf.cons-cell/ConsCell</code>     objects. However, if called with just a single arg, <code>expr</code>, I’ll assume it’s    being called from the Clojure REPL and will coerce the <code>expr</code> to <code>ConsCell</code>. </td></tr>
+<tr><td> FACTORIAL    </td><td> Lisp lambda function </td><td> ?                </td><td> ?              </td><td> ?                    </td></tr>
+<tr><td> FIXP         </td><td> Host lambda function </td><td> ?                </td><td> PREDICATE      </td><td> ?                    </td></tr>
+<tr><td> GENSYM       </td><td> Host lambda function </td><td> ?                </td><td>                </td><td> Generate a unique symbol. </td></tr>
+<tr><td> GET          </td><td> Host lambda function </td><td> ?                </td><td>                </td><td> From the manual:        ‘<code>get</code> is somewhat like <code>prop</code>; however its value is car of the rest of    the list if the <code>indicator</code> is found, and NIL otherwise.’        It’s clear that <code>GET</code> is expected to be defined in terms of <code>PROP</code>, but    we can’t implement <code>PROP</code> here because we lack <code>EVAL</code>; and we can’t have    <code>EVAL</code> here because both it and <code>APPLY</code> depends on <code>GET</code>.        OK, It’s worse than that: the statement of the definition of <code>GET</code> (and     of) <code>PROP</code> on page 59 says that the first argument to each must be a list;    But the in the definition of <code>ASSOC</code> on page 70, when <code>GET</code> is called its    first argument is always an atom. Since it’s <code>ASSOC</code> and <code>EVAL</code> which I     need to make work, I’m going to assume that page 59 is wrong. </td></tr>
+<tr><td> GREATERP     </td><td> Host lambda function </td><td> ?                </td><td> PREDICATE      </td><td> ?                    </td></tr>
+<tr><td> INTEROP      </td><td> Host lambda function </td><td> ?                </td><td> ?              </td><td> ?                    </td></tr>
+<tr><td> INTERSECTION </td><td> Lisp lambda function </td><td> ?                </td><td> ?              </td><td> ?                    </td></tr>
+<tr><td> LENGTH       </td><td> Lisp lambda function </td><td> ?                </td><td>                </td><td> see manual pages <a href="#page62">62</a> </td></tr>
+<tr><td> LESSP        </td><td> Host lambda function </td><td> ?                </td><td> PREDICATE      </td><td> ?                    </td></tr>
+<tr><td> MAPLIST      </td><td> Lisp lambda function </td><td> ?                </td><td> FUNCTIONAL     </td><td> see manual pages <a href="#page20">20</a>, <a href="#page21">21</a>, <a href="#page63">63</a> </td></tr>
+<tr><td> MEMBER       </td><td> Lisp lambda function </td><td> ?                </td><td> PREDICATE      </td><td> see manual pages <a href="#page11">11</a>, <a href="#page62">62</a> </td></tr>
+<tr><td> MINUSP       </td><td> Lisp lambda function </td><td> ?                </td><td> PREDICATE      </td><td> see manual pages <a href="#page26">26</a>, <a href="#page64">64</a> </td></tr>
+<tr><td> NOT          </td><td> Lisp lambda function </td><td> ?                </td><td> PREDICATE      </td><td> see manual pages <a href="#page21">21</a>, <a href="#page23">23</a>, <a href="#page58">58</a> </td></tr>
+<tr><td> NULL         </td><td> Lisp lambda function </td><td> ?                </td><td> PREDICATE      </td><td> see manual pages <a href="#page11">11</a>, <a href="#page57">57</a> </td></tr>
+<tr><td> NUMBERP      </td><td> Host lambda function </td><td> ?                </td><td> PREDICATE      </td><td> ?                    </td></tr>
+<tr><td> OBLIST       </td><td> Host lambda function </td><td> ?                </td><td>                </td><td> Return a list of the symbols currently bound on the object list.        <strong>NOTE THAT</strong> in the Lisp 1.5 manual, footnote at the bottom of page 69, it implies     that an argument can be passed but I’m not sure of the semantics of    this. </td></tr>
+<tr><td> ONEP         </td><td> Lisp lambda function </td><td> ?                </td><td> PREDICATE      </td><td> see manual pages <a href="#page26">26</a>, <a href="#page64">64</a> </td></tr>
+<tr><td> OR           </td><td> Host lambda function </td><td> ?                </td><td> PREDICATE      </td><td> <code>T</code> if and only if at least one of my <code>args</code> evaluates to something other   than either <code>F</code> or <code>NIL</code>, else <code>F</code>.        In <code>beowulf.host</code> principally because I don’t yet feel confident to define    varargs functions in Lisp. </td></tr>
+<tr><td> PAIR         </td><td> Lisp lambda function </td><td> ?                </td><td>                </td><td> see manual pages <a href="#page60">60</a> </td></tr>
+<tr><td> PAIRLIS      </td><td> Lisp lambda function, Host lambda function </td><td> ?                </td><td> ?              </td><td> This function gives the list of pairs of corresponding elements of the   lists <code>x</code> and <code>y</code>, and APPENDs this to the list <code>a</code>. The resultant list   of pairs, which is like a table with two columns, is called an   association list.    Eessentially, it builds the environment on the stack, implementing shallow   binding.    All args are assumed to be <code>beowulf.cons-cell/ConsCell</code> objects.   See page 12 of the Lisp 1.5 Programmers Manual.        <strong>NOTE THAT</strong> this function is overridden by an implementation in Lisp,    but is currently still present for bootstrapping. </td></tr>
+<tr><td> PLUS         </td><td> Host lambda function </td><td> ?                </td><td>                </td><td> ?                    </td></tr>
+<tr><td> PRETTY       </td><td>                </td><td> ?                </td><td> ?              </td><td> ?                    </td></tr>
+<tr><td> PRINT        </td><td>                </td><td> ?                </td><td> PSEUDO-FUNCTION  </td><td> see manual pages <a href="#page65">65</a>, <a href="#page84">84</a> </td></tr>
+<tr><td> PROG         </td><td> Host nlambda function </td><td> ?                </td><td>                </td><td> The accursed <code>PROG</code> feature. See page 71 of the manual.        Lisp 1.5 introduced <code>PROG</code>, and most Lisps have been stuck with it ever     since. It introduces imperative programming into what should be a pure     functional language, and consequently it’s going to be a pig to implement.        Broadly, <code>PROG</code> is a variadic pseudo function called as a <code>FEXPR</code> (or     possibly an <code>FSUBR</code>, although I’m not presently sure that would even work.)     The arguments, which are unevaluated, are a list of forms, the first of     which is expected to be a list of symbols which will be treated as names     of variables within the program, and the rest of which (the ‘program body’)    are either lists or symbols. Lists are treated as Lisp expressions which    may be evaulated in turn. Symbols are treated as targets for the <code>GO</code>     statement.            <strong>GO:</strong>     A <code>GO</code> statement takes the form of <code>(GO target)</code>, where     <code>target</code> should be one of the symbols which occur at top level among that    particular invocation of <code>PROG</code>s arguments. A <code>GO</code> statement may occur at     top level in a PROG, or in a clause of a <code>COND</code> statement in a <code>PROG</code>, but    not in a function called from the <code>PROG</code> statement. When a <code>GO</code> statement    is evaluated, execution should transfer immediately to the expression which    is the argument list immediately following the symbol which is its target.     If the target is not found, an error with the code <code>A6</code> should be thrown.     <strong>RETURN:</strong>     A <code>RETURN</code> statement takes the form <code>(RETURN value)</code>, where     <code>value</code> is any value. Following the evaluation of a <code>RETURN</code> statement,     the <code>PROG</code> should immediately exit without executing any further     expressions, returning the  value.     <strong>SET and SETQ:</strong>    In addition to the above, if a <code>SET</code> or <code>SETQ</code> expression is encountered    in any expression within the <code>PROG</code> body, it should affect not the global    object list but instead only the local variables of the program.     <strong>COND:</strong>    In <strong>strict</strong> mode, when in normal execution, a <code>COND</code> statement none of     whose clauses match should not return <code>NIL</code> but should throw an error with    the code <code>A3</code>… <em>except</em> that inside a <code>PROG</code> body, it should not do so.    <em>sigh</em>.     <strong>Flow of control:</strong>    Apart from the exceptions specified above, expressions in the program body    are evaluated sequentially. If execution reaches the end of the program     body, <code>NIL</code> is returned.     Got all that?     Good. </td></tr>
+<tr><td> PROP         </td><td> Lisp lambda function </td><td> ?                </td><td> FUNCTIONAL     </td><td> see manual pages <a href="#page59">59</a> </td></tr>
+<tr><td> QUOTE        </td><td> Lisp lambda function </td><td> ?                </td><td>                </td><td> see manual pages <a href="#page10">10</a>, <a href="#page22">22</a>, <a href="#page71">71</a> </td></tr>
+<tr><td> QUOTIENT     </td><td> Host lambda function </td><td> ?                </td><td>                </td><td> I’m not certain from the documentation whether Lisp 1.5 <code>QUOTIENT</code> returned   the integer part of the quotient, or a realnum representing the whole   quotient. I am for now implementing the latter. </td></tr>
+<tr><td> RANGE        </td><td> Lisp lambda function </td><td> ?                </td><td> ?              </td><td> ?                    </td></tr>
+<tr><td> READ         </td><td> Host lambda function </td><td> ?                </td><td> PSEUDO-FUNCTION  </td><td> An implementation of a Lisp reader sufficient for bootstrapping; not necessarily   the final Lisp reader. <code>input</code> should be either a string representation of a LISP   expression, or else an input stream. A single form will be read. </td></tr>
+<tr><td> REMAINDER    </td><td> Host lambda function </td><td> ?                </td><td>                </td><td> ?                    </td></tr>
+<tr><td> REPEAT       </td><td> Lisp lambda function </td><td> ?                </td><td> ?              </td><td> ?                    </td></tr>
+<tr><td> RPLACA       </td><td> Host lambda function </td><td> ?                </td><td> PSEUDO-FUNCTION </td><td> Replace the CAR pointer of this <code>cell</code> with this <code>value</code>. Dangerous, should   really not exist, but does in Lisp 1.5 (and was important for some   performance hacks in early Lisps) </td></tr>
+<tr><td> RPLACD       </td><td> Host lambda function </td><td> ?                </td><td> PSEUDO-FUNCTION </td><td> Replace the CDR pointer of this <code>cell</code> with this <code>value</code>. Dangerous, should   really not exist, but does in Lisp 1.5 (and was important for some   performance hacks in early Lisps) </td></tr>
+<tr><td> SEARCH       </td><td> Lisp lambda function </td><td> ?                </td><td> FUNCTIONAL     </td><td> see manual pages <a href="#page63">63</a> </td></tr>
+<tr><td> SET          </td><td> Host lambda function </td><td> ?                </td><td> PSEUDO-FUNCTION </td><td> Implementation of SET in Clojure. Add to the <code>oblist</code> a binding of the    value of <code>var</code> to the value of <code>val</code>. NOTE WELL: this is not SETQ! </td></tr>
+<tr><td> SUB1         </td><td> Lisp lambda function, Host lambda function </td><td> ?                </td><td>                </td><td> ?                    </td></tr>
+<tr><td> SUB2         </td><td> Lisp lambda function </td><td> ?                </td><td> ?              </td><td> ?                    </td></tr>
+<tr><td> SUBLIS       </td><td> Lisp lambda function </td><td> ?                </td><td>                </td><td> see manual pages <a href="#page12">12</a>, <a href="#page61">61</a> </td></tr>
+<tr><td> SUBST        </td><td> Lisp lambda function </td><td> ?                </td><td>                </td><td> see manual pages <a href="#page11">11</a>, <a href="#page61">61</a> </td></tr>
+<tr><td> SYSIN        </td><td> Host lambda function </td><td> ?                </td><td> ?              </td><td> Read the contents of the file at this <code>filename</code> into the object list.         If the file is not a valid Beowulf sysout file, this will probably     corrupt the system, you have been warned. File paths will be considered     relative to the filepath set when starting Lisp.     It is intended that sysout files can be read both from resources within    the jar file, and from the file system. If a named file exists in both the    file system and the resources, the file system will be preferred.        <strong>NOTE THAT</strong> if the provided <code>filename</code> does not end with <code>.lsp</code> (which,    if you’re writing it from the Lisp REPL, it won’t), the extension <code>.lsp</code>    will be appended.        <strong>NOTE THAT</strong> this is an extension function, not available in strct mode. </td></tr>
+<tr><td> SYSOUT       </td><td> Host lambda function </td><td> ?                </td><td> ?              </td><td> Dump the current content of the object list to file. If no <code>filepath</code> is    specified, a file name will be constructed of the symbol <code>Sysout</code> and     the current date. File paths will be considered relative to the filepath    set when starting Lisp.        <strong>NOTE THAT</strong> this is an extension function, not available in strct mode. </td></tr>
+<tr><td> TERPRI       </td><td>                </td><td> ?                </td><td> PSEUDO-FUNCTION </td><td> see manual pages <a href="#page65">65</a>, <a href="#page84">84</a> </td></tr>
+<tr><td> TIMES        </td><td> Host lambda function </td><td> ?                </td><td>                </td><td> ?                    </td></tr>
+<tr><td> TRACE        </td><td> Host lambda function </td><td> ?                </td><td> PSEUDO-FUNCTION </td><td> Add this <code>s</code> to the set of symbols currently being traced. If <code>s</code>    is not a symbol or sequence of symbols, does nothing. </td></tr>
+<tr><td> UNION        </td><td> Lisp lambda function </td><td> ?                </td><td> ?              </td><td> ?                    </td></tr>
+<tr><td> UNTRACE      </td><td> Host lambda function </td><td> ?                </td><td> PSEUDO-FUNCTION </td><td> Remove this <code>s</code> from the set of symbols currently being traced. If <code>s</code>    is not a symbol or sequence of symbols, does nothing. </td></tr>
+<tr><td> ZEROP        </td><td> Lisp lambda function </td><td> ?                </td><td> PREDICATE      </td><td> see manual pages <a href="#page26">26</a>, <a href="#page64">64</a> </td></tr>
+</tbody>
+</table>
+<p>Functions described as ‘Lisp function’ above are defined in the default sysout file, <code>resources/lisp1.5.lsp</code>, which will be loaded by default unless you specify another initfile on the command line.</p>
+<p>Functions described as ‘Host function’ are implemented in Clojure, but if you’re brave you can redefine them in Lisp and the Lisp definitions will take precedence over the Clojure implementations.</p>
+<h3><a href="#architectural-plan" id="architectural-plan"></a>Architectural plan</h3>
+<p>Not everything documented in this section is yet built. It indicates the direction of travel and intended destination, not the current state.</p>
+<h4><a href="#resourceslisp15lsp" id="resourceslisp15lsp"></a>resources/lisp1.5.lsp</h4>
+<p>The objective is to have within <code>resources/lisp1.5.lsp</code>, all those functions defined in the Lisp 1.5 Programmer’s Manual which can be implemented in Lisp.</p>
+<p>This means that, while Beowulf is hosted on Clojure, all that would be required to rehost Lisp 1.5 on a different platform would be to reimplement</p>
+<ul>
+<li>bootstrap.clj</li>
+<li>host.clj</li>
+<li>read.clj</li>
+</ul>
+<p>The objective this is to make it fairly easy to implement Lisp 1.5 on top of any of the many <a href="https://github.com/kanaka/mal">Make A Lisp</a> implementations.</p>
+<h4><a href="#beowulfboostrapclj" id="beowulfboostrapclj"></a>beowulf/boostrap.clj</h4>
+<p>This file is essentially Lisp as defined in Chapter 1 (pages 1-14) of the Lisp 1.5 Programmer’s Manual; that is to say, a very simple Lisp language, which should, I believe, be sufficient in conjunction with the functions provided by <code>beowulf.host</code>, to bootstrap the full Lisp 1.5 interpreter.</p>
+<p>In addition it contains the function <code>INTEROP</code>, which allows host language functions to be called from Lisp.</p>
+<h4><a href="#beowulfhostclj" id="beowulfhostclj"></a>beowulf/host.clj</h4>
+<p>This file provides Lisp 1.5 functions which can’t be (or can’t efficiently be) implemented in Lisp 1.5, which therefore need to be implemented in the host language, in this case Clojure.</p>
+<h4><a href="#beowulfreadclj" id="beowulfreadclj"></a>beowulf/read.clj</h4>
+<p>This file provides the reader required for boostrapping. It’s not a bad reader - it provides feedback on errors found in the input - but it isn’t the real Lisp reader.</p>
+<p>Intended deviations from the behaviour of the real Lisp reader are as follows:</p>
+<ol>
+<li>It reads the meta-expression language <code>MEXPR</code> in addition to the symbolic expression language <code>SEXPR</code>, which I do not believe the Lisp 1.5 reader ever did;</li>
+<li>It treats everything between a double semi-colon and an end of line as a comment, as most modern Lisps do; but I do not believe Lisp 1.5 had this feature.</li>
+</ol>
+<h3><a href="#commentary" id="commentary"></a>Commentary</h3>
+<p>What’s surprised me in working on this is how much more polished Lisp 1.5 is than legend had led me to believe. The language is remarkably close to <a href="http://www.softwarepreservation.org/projects/LISP/standard_lisp_family/#Portable_Standard_LISP_">Portable Standard Lisp</a> which is in my opinion one of the best and most usable early Lisp implementations.</p>
+<p>What’s even more surprising is how faithful a reimplementation of Lisp 1.5 the first Lisp dialect I learned, <a href="https://en.wikipedia.org/wiki/Acornsoft_LISP">Acornsoft Lisp</a>, turns out to have been.</p>
+<p>I’m convinced you could still use Lisp 1.5 for interesting and useful software (which isn’t to say that modern Lisps aren’t better, but this is software which is almost sixty years old).</p>
+<h2><a href="#installation" id="installation"></a>Installation</h2>
+<p>Download the latest <a href="https://github.com/simon-brooke/beowulf/releases">release ‘uberjar’</a> and run it using:</p>
+<pre><code class="language-bash">    java -jar &lt;path name of uberjar&gt;
+</code></pre>
+<p>Or clone the source and build it using:</p>
+<pre><code class="language-bash">    lein uberjar`
+</code></pre>
+<p>To build it you will require to have <a href="https://leiningen.org/">Leiningen</a> installed.</p>
+<h3><a href="#inputoutput" id="inputoutput"></a>Input/output</h3>
+<p>Lisp 1.5 greatly predates modern computers. It had a facility to print to a line printer, or to punch cards on a punch-card machine, and it had a facility to read system images in from tape; but there’s no file I/O as we would currently understand it, and, because there are no character strings and the valid characters within an atom are limited, it isn’t easy to compose a sensible filename.</p>
+<p>I’ve provided two functions to work around this problem.</p>
+<h4><a href="#sysout" id="sysout"></a>SYSOUT</h4>
+<p><code>SYSOUT</code> dumps the global object list to disk as a single S Expression (specifically: an association list). This allows you to persist your session, with all your current work, to disk. The function takes one argument, expected to be a symbol, and, if that argument is provided, writes a file whose name is that symbol with <code>.lsp</code> appended. If no argument is provided, it will construct a filename comprising the token <code>Sysout</code>, followed by the current date, followed by <code>.lsp</code>. In either case the file will be written to the directory given in the FILEPATH argument at startup time, or by default the current directory.</p>
+<p>Obviously, <code>SYSOUT</code> may be called interactively (and this is the expected practice).</p>
+<h4><a href="#sysin" id="sysin"></a>SYSIN</h4>
+<p><code>SYSIN</code> reads a file from disk and overwrites the global object list with its contents. The expected practice is that this will be a file created by <code>SYSOUT</code>. A command line flag <code>--read</code> is provided so that you can specify</p>
+<h2><a href="#learning-lisp-15" id="learning-lisp-15"></a>Learning Lisp 1.5</h2>
+<p>The <code>Lisp 1.5 Programmer's Manual</code> is still <a href="https://mitpress.mit.edu/books/lisp-15-programmers-manual">in print, ISBN 13 978-0-262-13011-0</a>; but it’s also <a href="http://www.softwarepreservation.org/projects/LISP/book/LISP%201.5%20Programmers%20Manual.pdf">available online</a>.</p>
+<h2><a href="#other-lisp-15-resources" id="other-lisp-15-resources"></a>Other Lisp 1.5 resources</h2>
+<p>The main resource I’m aware of is the Software Preservation Society’s site, <a href="http://www.softwarepreservation.org/projects/LISP/lisp1.5">here</a>. It has lots of fascinating stuff including full assembler listings for various obsolete processors, but I failed to find the Lisp source of Lisp functions as a text file, which is why <code>resources/lisp1.5.lsp</code> is largely copytyped and reconstructed from the manual.</p>
+<h3><a href="#other-implementations" id="other-implementations"></a>Other implementations</h3>
+<p>There’s an online (browser native) Lisp 1.5 implementation <a href="https://pages.zick.run/ichigo/">here</a> (source code <a href="https://github.com/zick/IchigoLisp">here</a>). It even has a working compiler!</p>
+<h3><a href="#history-resources" id="history-resources"></a>History resources</h3>
+<p>I’m compiling a <a href="https://simon-brooke.github.io/beowulf/docs/further_reading.html">list of links to historical documents on Lisp 1.5</a>.</p>
+<h2><a href="#license" id="license"></a>License</h2>
+<p>Copyright © 2019 Simon Brooke. Licensed under the GNU General Public License, version 2.0 or (at your option) any later version.</p>
+</div></div></div></body></html>

project.clj

@@ -2,16 +2,11 @@
   :aot :all
   :cloverage {:output "docs/cloverage"
               :ns-exclude-regex [#"beowulf\.gendoc" #"beowulf\.scratch"]}
-  :codox {:html {:transforms [[:head] [:append 
+  :codox {:metadata {:doc "**TODO**: write docs"
-                                       [:link {:rel "icon"
-                                               :type "image/x-icon"
-                                               :href "../img/beowulf_logo_favicon.png"}]]]}
-          :metadata {:doc "**TODO**: write docs"
                      :doc/format :markdown}
           :output-path "docs/codox"
           :source-uri "https://github.com/simon-brooke/beowulf/blob/master/{filepath}#L{line}"
-          ;; :themes [:journeyman]
+          :themes [:journeyman]}
-          }
   :description "LISP 1.5 is to all Lisp dialects as Beowulf is to English literature."
   :license {:name "GPL-2.0-or-later"
             :url "https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html"}
@@ -23,15 +18,17 @@
                  [clojure.java-time "1.2.0"]
                  [environ "1.2.0"]
                  [instaparse "1.4.12"]
-;;                 [org.jline/jline "3.23.0"]
+                 [org.jline/jline "3.23.0"]
-                 [rhizome "0.2.9"] ;; not needed in production builds
+                 [com.github.seancorfield/expectations "2.0.165"]
+                 ;; [rhizome "0.2.9"] ;; not needed in production builds
                  ]
   :main  beowulf.core
   :plugins [[lein-cloverage "1.2.2"]
-            [lein-codox "0.10.7"]
+            [lein-codox "0.10.8"]
             [lein-environ "1.1.0"]]
   :profiles {:jar {:aot :all}
-             :uberjar {:aot :all}}
+             :uberjar {:aot :all}
+             :dev {:resource-paths ["resources"]}}
   :release-tasks [["vcs" "assert-committed"]
                   ["change" "version" "leiningen.release/bump-version" "release"]
                   ["vcs" "commit"]
@@ -42,4 +39,4 @@
                   ["change" "version" "leiningen.release/bump-version"]
                   ["vcs" "commit"]]
   :target-path "target/%s"
-  :url "https://github.com/simon-brooke/the-great-game")
+  :url "https://github.com/simon-brooke/beowulf")

resources/codox/theme/journeyman/css/default.css

@@ -0,0 +1,563 @@
+body {
+    font-family: Helvetica, Arial, sans-serif;
+    font-size: 15px;
+    color: limegreen;
+    background-color: black;
+}
+
+a {
+    color: lime;
+}
+
+a:active, a:hover {
+    color: yellowgreen;
+}
+
+a:visited {
+    color: green;
+}
+
+pre, code {
+    font-family: Monaco, DejaVu Sans Mono, Consolas, monospace;
+    font-size: 9pt;
+    margin: 15px 0;
+    color: limegreen;
+    background-color: #111;
+}
+
+h1 {
+    font-weight: normal;
+    font-size: 29px;
+    margin: 10px 0 2px 0;
+    padding: 0;
+}
+
+h2 {
+    font-weight: normal;
+    font-size: 25px;
+}
+
+th, td {
+    vertical-align: top;
+}
+
+h5.license {
+    margin: 9px 0 22px 0;
+    color: lime;
+    font-weight: normal;
+    font-size: 12px;
+    font-style: italic;
+}
+
+.document h1, .namespace-index h1 {
+    font-size: 32px;
+    margin-top: 12px;
+}
+
+#header, #content, .sidebar {
+    position: fixed;
+}
+
+#header {
+    top: 0;
+    left: 0;
+    right: 0;
+    height: 22px;
+    color: limegreen;
+    padding: 5px 7px;
+}
+
+#content {
+    top: 32px;
+    right: 0;
+    bottom: 0;
+    overflow: auto;
+    background: black;
+    color: green;
+    padding: 0 18px;
+}
+
+.sidebar {
+    position: fixed;
+    top: 32px;
+    bottom: 0;
+    overflow: auto;
+}
+
+.sidebar.primary {
+    background: #080808;
+    border-right: solid 1px forestgreen;
+    left: 0;
+    width: 250px;
+}
+
+.sidebar.secondary {
+    background: #111;
+    border-right: solid 1px darkgreen;
+    left: 251px;
+    width: 200px;
+}
+
+#content.namespace-index, #content.document {
+    left: 251px;
+}
+
+#content.namespace-docs {
+    left: 452px;
+}
+
+#content.document {
+    padding-bottom: 10%;
+}
+
+#header {
+    background: #080808;
+    box-shadow: 0 0 8px rgba(192, 255, 192, 0.4);
+    z-index: 100;
+}
+
+#header h1 {
+    margin: 0;
+    padding: 0;
+    font-size: 18px;
+    font-weight: lighter;
+    text-shadow: -1px -1px 0px #333;
+}
+
+#header h1 .project-version {
+    font-weight: normal;
+}
+
+.project-version {
+    padding-left: 0.15em;
+}
+
+#header a, .sidebar a {
+    display: block;
+    text-decoration: none;
+}
+
+#header h2 {
+    float: right;
+    font-size: 9pt;
+    font-weight: normal;
+    margin: 4px 3px;
+    padding: 0;
+    color: #5f5;
+}
+
+#header h2 a {
+    display: inline;
+}
+
+.sidebar h3 {
+    margin: 0;
+    padding: 10px 13px 0 13px;
+    font-size: 19px;
+    font-weight: lighter;
+}
+
+.sidebar h3 a {
+    color: #4f4;
+}
+
+.sidebar h3.no-link {
+    color: green;
+}
+
+.sidebar ul {
+    padding: 7px 0 6px 0;
+    margin: 0;
+}
+
+.sidebar ul.index-link {
+    padding-bottom: 4px;
+}
+
+.sidebar li {
+    display: block;
+    vertical-align: middle;
+}
+
+.sidebar li a, .sidebar li .no-link {
+    border-left: 3px solid transparent;
+    padding: 0 10px;
+    white-space: nowrap;
+}
+
+.sidebar li .no-link {
+    display: block;
+    color: #7F7;
+    font-style: italic;
+}
+
+.sidebar li .inner {
+    display: inline-block;
+    padding-top: 7px;
+    height: 24px;
+}
+
+.sidebar li a, .sidebar li .tree {
+    height: 31px;
+}
+
+.depth-1 .inner { padding-left: 2px; }
+.depth-2 .inner { padding-left: 6px; }
+.depth-3 .inner { padding-left: 20px; }
+.depth-4 .inner { padding-left: 34px; }
+.depth-5 .inner { padding-left: 48px; }
+.depth-6 .inner { padding-left: 62px; }
+
+.sidebar li .tree {
+    display: block;
+    float: left;
+    position: relative;
+    top: -10px;
+    margin: 0 4px 0 0;
+    padding: 0;
+}
+
+.sidebar li.depth-1 .tree {
+    display: none;
+}
+
+.sidebar li .tree .top, .sidebar li .tree .bottom {
+    display: block;
+    margin: 0;
+    padding: 0;
+    width: 7px;
+}
+
+.sidebar li .tree .top {
+    border-left: 1px solid yellowgreen;
+    border-bottom: 1px solid yellowgreen;
+    height: 19px;
+}
+
+.sidebar li .tree .bottom {
+    height: 22px;
+}
+
+.sidebar li.branch .tree .bottom {
+    border-left: 1px solid yellowgreen;
+}
+
+.sidebar.primary li.current a {
+    border-left: 3px solid goldenrod;
+    color: goldenrod;
+}
+
+.sidebar.secondary li.current a {
+    border-left: 3px solid yellow;
+    color: yellow;
+}
+
+.namespace-index h2 {
+    margin: 30px 0 0 0;
+}
+
+.namespace-index h3 {
+    font-size: 16px;
+    font-weight: bold;
+    margin-bottom: 0;
+}
+
+.namespace-index .topics {
+    padding-left: 30px;
+    margin: 11px 0 0 0;
+}
+
+.namespace-index .topics li {
+    padding: 5px 0;
+}
+
+.namespace-docs h3 {
+    font-size: 18px;
+    font-weight: bold;
+}
+
+.public h3 {
+    margin: 0;
+    float: left;
+}
+
+.usage {
+    clear: both;
+}
+
+.public {
+    margin: 0;
+    border-top: 1px solid lime;
+    padding-top: 14px;
+    padding-bottom: 6px;
+}
+
+.public:last-child {
+    margin-bottom: 20%;
+}
+
+.members .public:last-child {
+    margin-bottom: 0;
+}
+
+.members {
+    margin: 15px 0;
+}
+
+.members h4 {
+    color: lime;
+    font-weight: normal;
+    font-variant: small-caps;
+    margin: 0 0 5px 0;
+}
+
+.members .inner {
+    padding-top: 5px;
+    padding-left: 12px;
+    margin-top: 2px;
+    margin-left: 7px;
+    border-left: 1px solid #5f5;
+}
+
+#content .members .inner h3 {
+    font-size: 12pt;
+}
+
+.members .public {
+    border-top: none;
+    margin-top: 0;
+    padding-top: 6px;
+    padding-bottom: 0;
+}
+
+.members .public:first-child {
+    padding-top: 0;
+}
+
+h4.type,
+h4.dynamic,
+h4.added,
+h4.deprecated {
+    float: left;
+    margin: 3px 10px 15px 0;
+    font-size: 15px;
+    font-weight: bold;
+    font-variant: small-caps;
+}
+
+.public h4.type,
+.public h4.dynamic,
+.public h4.added,
+.public h4.deprecated {
+    font-size: 13px;
+    font-weight: bold;
+    margin: 3px 0 0 10px;
+}
+
+.members h4.type,
+.members h4.added,
+.members h4.deprecated {
+    margin-top: 1px;
+}
+
+h4.type {
+    color: #717171;
+}
+
+h4.dynamic {
+    color: #9933aa;
+}
+
+h4.added {
+    color: #7acc32;
+}
+
+h4.deprecated {
+    color: #880000;
+}
+
+.namespace {
+    margin-bottom: 30px;
+}
+
+.namespace:last-child {
+    margin-bottom: 10%;
+}
+
+.index {
+    padding: 0;
+    font-size: 80%;
+    margin: 15px 0;
+    line-height: 16px;
+}
+
+.index * {
+    display: inline;
+}
+
+.index p {
+    padding-right: 3px;
+}
+
+.index li {
+    padding-right: 5px;
+}
+
+.index ul {
+    padding-left: 0;
+}
+
+.type-sig {
+    clear: both;
+    color: goldenrod;
+}
+
+.type-sig pre {
+    padding-top: 10px;
+    margin: 0;
+}
+
+.usage code {
+    display: block;
+    margin: 2px 0;
+    color: limegreen;
+}
+
+.usage code:first-child {
+    padding-top: 10px;
+}
+
+p {
+    margin: 15px 0;
+}
+
+.public p:first-child, .public pre.plaintext {
+    margin-top: 12px;
+}
+
+.doc {
+    margin: 0 0 26px 0;
+    clear: both;
+}
+
+.public .doc {
+    margin: 0;
+}
+
+.namespace-index .doc {
+    margin-bottom: 20px;
+}
+
+.namespace-index .namespace .doc {
+    margin-bottom: 10px;
+}
+
+.markdown p, .markdown li, .markdown dt, .markdown dd, .markdown td {
+    line-height: 22px;
+}
+
+.markdown li {
+    padding: 2px 0;
+}
+
+.markdown h2 {
+    font-weight: normal;
+    font-size: 25px;
+    margin: 30px 0 10px 0;
+}
+
+.markdown h3 {
+    font-weight: normal;
+    font-size: 20px;
+    margin: 30px 0 0 0;
+}
+
+.markdown h4 {
+    font-size: 15px;
+    margin: 22px 0 -4px 0;
+}
+
+.doc, .public, .namespace .index {
+    max-width: 680px;
+    overflow-x: visible;
+}
+
+.markdown pre > code {
+    display: block;
+    padding: 10px;
+}
+
+.markdown pre > code, .src-link a {
+    border: 1px solid lime;
+    border-radius: 2px;
+}
+
+.markdown code:not(.hljs), .src-link a {
+    background: #111;
+}
+
+pre.deps {
+    display: inline-block;
+    margin: 0 10px;
+    border: 1px solid lime;
+    border-radius: 2px;
+    padding: 10px;
+    background-color: #111;
+}
+
+.markdown hr {
+    border-style: solid;
+    border-top: none;
+    color: goldenrod;
+}
+
+.doc ul, .doc ol {
+    padding-left: 30px;
+}
+
+.doc table {
+    border-collapse: collapse;
+    margin: 0 10px;
+}
+
+.doc table td, .doc table th {
+    border: 1px solid goldenrod;
+    padding: 4px 6px;
+}
+
+.doc table th {
+    background: #111;
+}
+
+.doc dl {
+    margin: 0 10px 20px 10px;
+}
+
+.doc dl dt {
+    font-weight: bold;
+    margin: 0;
+    padding: 3px 0;
+    border-bottom: 1px solid goldenrod;
+}
+
+.doc dl dd {
+    padding: 5px 0;
+    margin: 0 0 5px 10px;
+}
+
+.doc abbr {
+    border-bottom: 1px dotted goldenrod;
+    font-variant: none;
+    cursor: help;
+}
+
+.src-link {
+    margin-bottom: 15px;
+}
+
+.src-link a {
+    font-size: 70%;
+    padding: 1px 4px;
+    text-decoration: none;
+    color: lime5bb;
+}

resources/codox/theme/journeyman/css/highlight.css

@@ -0,0 +1,97 @@
+/*
+github.com style (c) Vasily Polovnyov <vast@whiteants.net>
+*/
+
+.hljs {
+  display: block;
+  overflow-x: auto;
+  padding: 0.5em;
+  color: #333;
+  background: #f8f8f8;
+}
+
+.hljs-comment,
+.hljs-quote {
+  color: #998;
+  font-style: italic;
+}
+
+.hljs-keyword,
+.hljs-selector-tag,
+.hljs-subst {
+  color: #333;
+  font-weight: bold;
+}
+
+.hljs-number,
+.hljs-literal,
+.hljs-variable,
+.hljs-template-variable,
+.hljs-tag .hljs-attr {
+  color: #008080;
+}
+
+.hljs-string,
+.hljs-doctag {
+  color: #d14;
+}
+
+.hljs-title,
+.hljs-section,
+.hljs-selector-id {
+  color: #900;
+  font-weight: bold;
+}
+
+.hljs-subst {
+  font-weight: normal;
+}
+
+.hljs-type,
+.hljs-class .hljs-title {
+  color: #458;
+  font-weight: bold;
+}
+
+.hljs-tag,
+.hljs-name,
+.hljs-attribute {
+  color: #000080;
+  font-weight: normal;
+}
+
+.hljs-regexp,
+.hljs-link {
+  color: #009926;
+}
+
+.hljs-symbol,
+.hljs-bullet {
+  color: #990073;
+}
+
+.hljs-built_in,
+.hljs-builtin-name {
+  color: #0086b3;
+}
+
+.hljs-meta {
+  color: #999;
+  font-weight: bold;
+}
+
+.hljs-deletion {
+  background: #fdd;
+}
+
+.hljs-addition {
+  background: #dfd;
+}
+
+.hljs-emphasis {
+  font-style: italic;
+}
+
+.hljs-strong {
+  font-weight: bold;
+}

resources/codox/theme/journeyman/theme.edn

@@ -0,0 +1,11 @@
+{:resources ["css/default.css" "css/highlight.css"]
+ :transforms [[:head] [:append
+                       [:link {:rel "stylesheet"
+                               :type "text/css"
+                               :href "css/default.css"}]
+                       [:link {:rel "stylesheet"
+                               :type "text/css"
+                               :href "css/highlight.css"}]
+                       [:link {:rel "icon"
+                               :type "image/x-icon"
+                               :href "../img/beowulf_logo_favicon.png"}]]]}

resources/codox/themes/journeyman/theme.edn

@@ -1 +0,0 @@
-{:resources ["css/default.css" "css/highlight.css"]}

resources/lisp1.5.lsp

@@ -25,6 +25,7 @@
         (T (ASSOC X (CDR L)))))
     SUBR (BEOWULF HOST ASSOC))
   (ATOM 32767 SUBR (BEOWULF HOST ATOM))
+  (ATTRIB 32767 SUBR (BEOWULF HOST ATTRIB))
   (CAR 32767 SUBR (BEOWULF HOST CAR))
   (CAAAAR 32767 EXPR (LAMBDA (X) (CAR (CAR (CAR (CAR X))))))
   (CAAADR 32767 EXPR (LAMBDA (X) (CAR (CAR (CAR (CDR X))))))
@@ -55,6 +56,16 @@
   (CDDDR 32767 EXPR (LAMBDA (X) (CDR (CDR (CDR X)))))
   (CDDR 32767 EXPR (LAMBDA (X) (CDR (CDR X))))
   (CDR 32767 SUBR (BEOWULF HOST CDR))
+  (CONC
+    32767
+    FEXPR
+    (LABEL
+      ARGS
+      (COND
+        ((COND
+            ((ONEP (LENGTH ARGS)) ARGS)
+            (T (ATTRIB (CAR ARGS) (APPLY CONC (CDR ARGS) NIL))))
+          ARGS))))
   (CONS 32767 SUBR (BEOWULF HOST CONS))
   (CONSP 32767 SUBR (BEOWULF HOST CONSP))
   (COPY
@@ -170,6 +181,7 @@
       (COND
         ((NULL X) (U))
         ((EQ (CAR X) Y) (CDR X)) (T (PROP (CDR X) Y U)))))
+  (PUT 32767 SUBR (BEOWULF HOST PUT))
   (QUOTE 32767 EXPR (LAMBDA (X) X))
   (QUOTIENT 32767 SUBR (BEOWULF HOST QUOTIENT))
   (RANGE
@@ -187,6 +199,7 @@
     (LAMBDA (N X) (COND ((EQ N 0) NIL) (T (CONS X (REPEAT (SUB1 N) X))))))
   (RPLACA 32767 SUBR (BEOWULF HOST RPLACA))
   (RPLACD 32767 SUBR (BEOWULF HOST RPLACD))
+  (SASSOC 32767 SUBR (BEOWULF BOOTSTRAP SASSOC))
   (SEARCH 32767 EXPR 
     (LAMBDA (X P F U) 
     (COND ((NULL X) (U X)) 

resources/sexpr/conc.lsp

@@ -1 +1,7 @@
-;; TODO
+;; This isn't working but it's really not far off.
+
+(PUT 'CONC 'FEXPR
+    ;; possibly ARGS should be (ARGS)...
+    '(LABEL ARGS
+        (COND ((COND ((ONEP (LENGTH ARGS)) ARGS)
+            (T (ATTRIB (CAR ARGS) (APPLY CONC (CDR ARGS) NIL)))) ARGS))))

src/beowulf/bootstrap.clj

@@ -11,9 +11,9 @@
   objects."
   (:require [beowulf.cons-cell :refer [F make-beowulf-list make-cons-cell
                                        pretty-print T]]
-            [beowulf.host :refer [ASSOC ATOM CAAR CADAR CADDR CADR CAR CDR GET
+            [beowulf.host :refer [ASSOC ATOM CAAR CADAR CADDR CADR CAR CDR
-                                  LIST NUMBERP PAIRLIS traced?]]
+                                  CONS ERROR GET LIST NUMBERP PAIRLIS traced?]]
-            [beowulf.oblist :refer [*options* NIL oblist]])
+            [beowulf.oblist :refer [*options* NIL]])
   (:import [beowulf.cons_cell ConsCell]
            [clojure.lang Symbol]))
 
@@ -41,6 +41,12 @@
 
 ;;;; The PROGram feature ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
+(def ^:dynamic
+  *depth*
+  "Stack depth. Unfortunately we need to be able to pass round depth for 
+   functions which call EVAL/APPLY but do not know about depth."
+  0)
+
 (def find-target
   (memoize
    (fn [target body]
@@ -228,6 +234,21 @@
      (first (remove #(= % NIL) (map #(GET s %)
                                     indicators))))))
 
+(defn SASSOC
+  "Like `ASSOC`, but with an action to take if no value is found.
+   
+   From the manual, page 60:
+   
+   'The function `sassoc` searches `y`, which is a list of dotted pairs, for 
+   a pair whose first element that is `x`. If such a pair is found, the value 
+   of `sassoc` is this pair. Otherwise the function `u` of no arguments is 
+   taken as the value of `sassoc`.'"
+  [x y u]
+  (let [v (ASSOC x y)]
+    (if-not (= v NIL) v
+            (APPLY u NIL NIL))))
+
+
 ;;;; APPLY ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (defn try-resolve-subroutine
@@ -275,6 +296,24 @@
     (trace-response function-symbol result depth)
     result))
 
+(defn- apply-label 
+  "Apply in the special case that the first element in the function is `LABEL`."
+  [function args environment depth]
+  (APPLY
+   (CADDR function)
+   args
+   (CONS
+    (CONS (CADR function) (CADDR function))
+    environment)
+   depth))
+
+(defn- apply-lambda
+  "Apply in the special case that the first element in the function is `LAMBDA`."
+  [function args environment depth]
+  (EVAL
+   (CADDR function)
+   (PAIRLIS (CADR function) args environment) depth))
+
 (defn APPLY
   "Apply this `function` to these `arguments` in this `environment` and return
    the result.
@@ -282,38 +321,32 @@
    For bootstrapping, at least, a version of APPLY written in Clojure.
    All args are assumed to be symbols or `beowulf.cons-cell/ConsCell` objects.
    See page 13 of the Lisp 1.5 Programmers Manual."
-  [function args environment depth]
+  ([function args environment]
-  (trace-call 'APPLY (list function args environment) depth)
+   (APPLY function args environment *depth*))
-  (let [result (cond
+  ([function args environment depth]
-                 (= NIL function) (if (:strict *options*)
+   (binding [*depth* (inc depth)]
-                                    NIL
+     (trace-call 'APPLY (list function args environment) depth)
-                                    (throw (ex-info "NIL sí ne þegnung"
+     (let [result (cond
-                                                    {:phase :apply
+                    (= NIL function) (if (:strict *options*)
-                                                     :function "NIL"
+                                       NIL
-                                                     :args args
+                                       (throw (ex-info "NIL sí ne þegnung"
-                                                     :type :beowulf})))
+                                                       {:phase :apply
-                 (= (ATOM function) T) (apply-symbolic function args environment (inc depth))
+                                                        :function "NIL"
-                 :else (case (first function)
+                                                        :args args
-                         LABEL (APPLY
+                                                        :type :beowulf})))
-                                (CADDR function)
+                    (= (ATOM function) T) (apply-symbolic function args environment (inc depth))
-                                args
+                    :else (case (first function)
-                                (make-cons-cell
+                            LABEL (apply-label function args environment depth)
-                                 (make-cons-cell
+                            FUNARG (APPLY (CADR function) args (CADDR function) depth)
-                                  (CADR function)
+                            LAMBDA (apply-lambda function args environment depth)
-                                  (CADDR function))
+                            ;; else
-                                 environment)
+                            (throw (ex-info "Ungecnáwen wyrþan sí þegnung-weard"
-                                depth)
+                                            {:phase :apply
-                         FUNARG (APPLY (CADR function) args (CADDR function) depth)
+                                             :function function
-                         LAMBDA (EVAL
+                                             :args args
-                                 (CADDR function)
+                                             :type :beowulf}))))]
-                                 (PAIRLIS (CADR function) args environment) depth)
+       (trace-response 'APPLY result depth)
-                         (throw (ex-info "Ungecnáwen wyrþan sí þegnung-weard"
+       result))))
-                                         {:phase :apply
-                                          :function function
-                                          :args args
-                                          :type :beowulf}))))]
-    (trace-response 'APPLY result depth)
-    result))
 
 ;;;; EVAL ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
@@ -412,11 +445,10 @@
                                              (EVLIS (CDR expr) env depth)
                                              env
                                              depth))
-                  :else (APPLY
+                  :else (EVAL (CONS (CDR (SASSOC (CAR expr) env (fn [] (ERROR 'A9))))
-                         (CAR expr)
+                                    (CDR expr))
-                         (EVLIS (CDR expr) env depth)
+                              env
-                         env
+                              (inc depth)))]
-                         depth))]
      (trace-response 'EVAL result depth)
      result)))
 

src/beowulf/core.clj

@@ -53,7 +53,8 @@
                  (.canRead (io/file %)))
                "Could not find sysout file"]]
    ["-s" "--strict" "Strictly interpret the Lisp 1.5 language, without extensions."]
-   ["-t" "--time" "Time evaluations."]])
+   ["-t" "--time" "Time evaluations."]
+   ["-x" "--testing" "Disable the jline reader - useful when piping input."]])
 
 (defn- re 
   "Like REPL, but it isn't a loop and doesn't print."
@@ -64,10 +65,9 @@
   "Read/eval/print loop."
   [prompt]
   (loop [] 
-    (print prompt)
     (flush)
     (try
-      (if-let [input (trim (read-from-console))]
+      (if-let [input (trim (read-from-console prompt))]
         (if (= input stop-word)
           (throw (ex-info "\nFærwell!" {:cause :quit}))
           (println 
@@ -116,7 +116,7 @@
              (catch Throwable any
                (println any))))
       (try
-        (repl (str (:prompt (:options args)) " "))
+        (repl (:prompt (:options args)))
         (catch
          Exception
          e

src/beowulf/host.clj

@@ -91,22 +91,21 @@
   (cond
     (= l NIL) NIL
     (empty? path) l
-    :else
+    (not (instance? ConsCell l)) (throw (ex-info (str "Ne liste: "
-    (try
+                                                      l "; " (type l))
-      (case (last path)
+                                                 {:phase :eval
-        \a (uaf (.first l) (butlast path))
+                                                  :function "universal access function"
-        \d (uaf (.getCdr l) (butlast path))
+                                                  :args [l path]
-        (throw (ex-info (str "uaf: unexpected letter in path (only `a` and `d` permitted): " (last path))
+                                                  :type :beowulf}))
-                        {:cause  :uaf
+    :else (case (last path)
-                         :detail :unexpected-letter
+            \a (uaf (.first l) (butlast path))
-                         :expr   (last path)})))
+            \d (uaf (.getCdr l) (butlast path))
-      (catch ClassCastException e
+            (throw (ex-info (str "uaf: unexpected letter in path (only `a` and `d` permitted): "
-        (throw (ex-info
+                                 (last path))
-                (str "uaf: Not a LISP list? " (type l))
+                            {:phase :eval
-                {:cause  :uaf
+                             :function "universal access function"
-                 :detail :not-a-lisp-list
+                             :args [l path]
-                 :expr   l}
+                             :type :beowulf})))))
-                e))))))
 
 (defmacro CAAR [x] `(uaf ~x '(\a \a)))
 (defmacro CADR [x] `(uaf ~x '(\a \d)))
@@ -217,7 +216,7 @@
              :phase :host
              :detail :rplacd
              :args (list cell value)
-             :type :beowulf}))));; PLUS
+             :type :beowulf}))))
 
 (defn LIST
   [& args]
@@ -433,6 +432,41 @@
   "The unexplained magic number which marks the start of a property list."
   (Integer/parseInt "77777" 8))
 
+(defn hit-or-miss-assoc
+  "Find the position of the binding of this `target` in a Lisp 1.5 
+   property list `plist`.
+   
+   Lisp 1.5 property lists are not assoc lists, but lists of the form
+   `(name value name value name value...)`. It's therefore necessary to
+   recurse down the list two entries at a time to avoid confusing names
+   with values."
+  [target plist]
+  (if (and (instance? ConsCell plist) (even? (count plist)))
+    (cond (= plist NIL) NIL
+          (= (first plist) target) plist
+          :else (hit-or-miss-assoc target (CDDR plist)))
+    NIL))
+
+(defn ATTRIB
+  "Destructive append. From page 59 of the manual:
+   
+   The function `attrib` concatenates its two arguments by changing the last 
+   element of its first argument to point to the second argument. Thus it
+   is commonly used to tack something onto the end of a property list. 
+   The value of `attrib` is the second argument.
+
+   For example
+   ```
+   attrib[FF; (EXPR (LAMBDA (X) (COND ((ATOM X) X) (T (FF (CAR x))))))]
+   ```
+   would put EXPR followed by the LAMBDA expression for FF onto the end of 
+   the property list for FF."
+  [x e]
+  (loop [l x]
+    (cond
+      (instance? ConsCell (CDR l)) (recur (CDR l))
+      :else (when (RPLACD l e) e))))
+
 (defn PUT
   "Put this `value` as the value of the property indicated by this `indicator` 
    of this `symbol`. Return `value` on success.
@@ -440,22 +474,27 @@
    NOTE THAT there is no `PUT` defined in the manual, but it would have been 
    easy to have defined it so I don't think this fully counts as an extension."
   [symbol indicator value]
-  (if-let [binding (ASSOC symbol @oblist)]
+  (let [binding (ASSOC symbol @oblist)]
-    (if-let [prop (ASSOC indicator (CDDR binding))]
+    (if (instance? ConsCell binding)
-      (RPLACD prop value)
+      (let [prop (hit-or-miss-assoc indicator (CDDR binding))]
-      (RPLACD binding
+        (if (instance? ConsCell prop)
-              (make-cons-cell
+          (RPLACA (CDR prop) value)
-               magic-marker
+          ;; The implication is ATTRIB was used here, but I have not made that
-               (make-cons-cell
+          ;; work and this does work, so if it ain't broke don't fix it.
-                indicator
+          (RPLACD binding
-                (make-cons-cell value (CDDR binding))))))
+                  (make-cons-cell
-    (swap!
+                   magic-marker
-     oblist
+                   (make-cons-cell
-     (fn [ob s p v]
+                    indicator
-       (make-cons-cell
+                    (make-cons-cell value (CDDR binding)))))))
-        (make-beowulf-list (list s magic-marker p v))
+      (swap!
-        ob))
+       oblist
-     symbol indicator value)))
+       (fn [ob s p v]
+         (make-cons-cell
+          (make-beowulf-list (list s magic-marker p v))
+          ob))
+       symbol indicator value)))
+  value)
 
 (defn GET
   "From the manual:
@@ -477,13 +516,9 @@
         val (cond
               (= binding NIL) NIL
               (= magic-marker
-                 (CADR binding)) (loop [b binding]
+                 (CADR binding)) (let [p (hit-or-miss-assoc indicator binding)]
-                                  ;;  (println "GET loop, seeking " indicator ":")
+                                   (if-not (= NIL p)
-                                  ;;  (pretty-print b)
+                                     (CADR p)
-                                   (if (instance? ConsCell b)
-                                     (if (= (CAR b) indicator)
-                                       (CADR b) ;; <- this is what we should actually be returning
-                                       (recur (CDR b)))
                                      NIL))
               :else (throw
                      (ex-info "Misformatted property list (missing magic marker)"
@@ -499,9 +534,10 @@
    `indicator` of the symbol which is the first element of the pair to the 
    value which is the second element of the pair. See page 58 of the manual."
   [a-list indicator]
-  (map
+  (doall
-   #(PUT (CAR %) indicator (CDR %))
+   (map
-   a-list))
+    #(when (PUT (CAR %) indicator (CDR %)) (CAR %))
+    a-list)))
 
 (defn DEFINE
   "Bootstrap-only version of `DEFINE` which, post boostrap, can be overwritten 

src/beowulf/io.clj

@@ -91,7 +91,8 @@
   ([]
    (SYSOUT nil))
   ([filepath]
-   (spit (full-path (str filepath))
+   (let [destination (full-path (str filepath))]
+    (spit destination
          (with-out-str
            (println (apply str (repeat 79 ";")))
            (println (format ";; Beowulf %s Sysout file generated at %s"
@@ -103,7 +104,9 @@
            (println)
            (let [output (safely-wrap-subrs @oblist)]
              (pretty-print output)
-             )))))
+             )))
+     (println "Saved sysout to " destination)
+     NIL)))
 
 (defn resolve-subr
   "If this oblist `entry` references a subroutine, attempt to fix up that

src/beowulf/oblist.clj

@@ -41,5 +41,5 @@
 
 (def ^:dynamic *options*
   "Command line options from invocation."
-  {})
+  {:testing true})
 

src/beowulf/read.clj

@@ -13,13 +13,14 @@
 
   Both these extensions can be disabled by using the `--strict` command line
   switch."
-  (:require ;; [beowulf.reader.char-reader :refer [read-chars]]
+  (:require [beowulf.oblist :refer [*options*]]
+            [beowulf.reader.char-reader :refer [read-chars]]
             [beowulf.reader.generate :refer [generate]]
             [beowulf.reader.parser :refer [parse]]
             [beowulf.reader.simplify :refer [simplify]]
             [clojure.string :refer [join split starts-with? trim]])
-  (:import [java.io InputStream]
+  (:import [instaparse.gll Failure]
-           [instaparse.gll Failure]))
+           [java.io InputStream]))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;
@@ -82,24 +83,35 @@
              (throw (ex-info "Ne can forstande " (assoc parse-tree :source source))))
       (generate (simplify parse-tree)))))
 
-(defn read-from-console
+(defn- dummy-read-chars [prompt]
-  "Attempt to read a complete lisp expression from the console. NOTE that this
+  (loop [r "" p prompt]
-   will only really work for S-Expressions, not M-Expressions."
+    (if (and (seq r)
-  []
+             (= (count (re-seq #"\(" r))
-  (loop [r (read-line)]
+                (count (re-seq #"\)" r)))
-    (if (and (= (count (re-seq #"\(" r))
-           (count (re-seq #"\)" r)))
              (= (count (re-seq #"\[" r))
                 (count (re-seq #"\]" r))))
       r
-      (recur (str r "\n" (read-line))))))
+      (do
+        (print (str p " "))
+        (flush)
+        (recur (str r "\n" (read-line)) "::")))))
+
+(defn read-from-console
+  "Attempt to read a complete lisp expression from the console.
+   
+   There's a major problem here that the read-chars reader messes up testing.
+   We need to be able to disable it while testing!"
+  [prompt]
+  (if (:testing *options*)
+    (dummy-read-chars prompt)
+    (read-chars prompt)))
 
 (defn READ
   "An implementation of a Lisp reader sufficient for bootstrapping; not necessarily
   the final Lisp reader. `input` should be either a string representation of a LISP
   expression, or else an input stream. A single form will be read."
   ([]
-   (gsp (read-from-console)))
+   (gsp (read-from-console (:prompt *options*))))
   ([input]
    (cond
      (empty? input) (READ)

src/beowulf/reader/char_reader.clj

@@ -20,9 +20,12 @@
    TODO: There are multiple problems with JLine; a better solution might be
    to start from here:
    https://stackoverflow.com/questions/7931988/how-to-manipulate-control-characters"
-  ;; (:import [org.jline.reader LineReader LineReaderBuilder]
+  (:require [beowulf.oblist :refer [*options* oblist]])
-  ;;          [org.jline.terminal TerminalBuilder])
+  (:import [org.jline.reader.impl.completer StringsCompleter]
-  )
+           [org.jline.reader.impl DefaultParser DefaultParser$Bracket]
+           [org.jline.reader LineReaderBuilder]
+           [org.jline.terminal TerminalBuilder]
+           [org.jline.widget AutopairWidgets AutosuggestionWidgets]))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;
@@ -49,27 +52,56 @@
 ;; looks as though you'd need a DPhil in JLine to write it, and I don't have
 ;; the time.
 
-;; (def get-reader
+(defn build-completer
-;;   "Return a reader, first constructing it if necessary.
+  "Build a completer which takes tokens from the oblist.
    
-;;    **NOTE THAT** this is not settled API. The existence and call signature of
+   This is sort-of working, in as much as hitting <TAB> on a blank line will 
-;;    this function is not guaranteed in future versions."
+   show a table of values from the oblist, but hitting <TAB> after you've 
-;;   (memoize (fn []
+   started input does not show potential completions for tokens you've started."
-;;   (let [term (.build (.system (TerminalBuilder/builder) true))]
+  []
-;;     (.build (.terminal (LineReaderBuilder/builder) term))))))
+  (StringsCompleter. (map #(str (first %)) @oblist)))
 
-;; (defn read-chars
+;; This breaks; it is not correctly resolving the Enum, although I can't work out
-;;   "A drop-in replacement for `clojure.core/read-line`, except that line editing
+;; why not.
-;;    and history should be enabled.
+;; (defn build-parser
-   
-;;    **NOTE THAT** this does not work yet, but it is in the API because I hope 
-;;    that it will work later!"
 ;;   []
-;;     (let [eddie (get-reader)]
+;;   (println "Building parser")
-;;       (loop [s (.readLine eddie)]
+;;   (let [parser (DefaultParser.)]
-;;       (if (and (= (count (re-seq #"\(" s))
+;;     (doall
-;;            (count (re-seq #"\)" s)))
+;;      (.setEofOnUnclosedBracket 
-;;                (= (count (re-seq #"\[]" s))
+;;       parser DefaultParser$Bracket/ROUND))))
-;;                   (count (re-seq #"\]" s))))
+
-;;         s
+(def get-reader
-;;         (recur (str s " " (.readLine eddie)))))))
+  "Return a reader, first constructing it if necessary.
+   
+   **NOTE THAT** this is not settled API. The existence and call signature of
+   this function is not guaranteed in future versions."
+  (memoize (fn []
+            (let [term (.build (.system (TerminalBuilder/builder) true))
+                  reader (-> (LineReaderBuilder/builder)
+                              (.terminal  term)
+                              (.completer  (build-completer))
+ ;;       #(.parser % (build-parser))
+                              (.build))
+                  ;; apw (AutopairWidgets. reader false)
+                  ;; asw (AutosuggestionWidgets. reader)
+                  ]
+              ;; (.enable apw)
+              ;; (.enable asw)
+              reader))))
+
+(defn read-chars
+  "A drop-in replacement for `clojure.core/read-line`, except that line editing
+   and history should be enabled.
+   
+   **NOTE THAT** this does not fully work yet, but it is in the API because I 
+   hope that it will work later!"
+  [prompt]
+  (let [eddie (get-reader)]
+    (loop [s (.readLine eddie (str prompt " "))]
+      (if (and (= (count (re-seq #"\(" s))
+                  (count (re-seq #"\)" s)))
+               (= (count (re-seq #"\[]" s))
+                  (count (re-seq #"\]" s))))
+        s
+        (recur (str s " " (.readLine eddie ":: ")))))))

test/beowulf/core_test.clj

@@ -1,8 +1,9 @@
 (ns beowulf.core-test
-  (:require [clojure.java.io :refer [reader]]
+  (:require [beowulf.core :refer [-main repl stop-word]]
-            [clojure.string :refer [split]]
+            [beowulf.oblist :refer [*options*]]
-            [clojure.test :refer [deftest is testing]]
+            [clojure.java.io :refer [reader]]
-            [beowulf.core :refer [-main repl stop-word]]))
+            [clojure.string :refer [split starts-with?]]
+            [clojure.test :refer [deftest is testing]]))
 
 ;; (deftest a-test
 ;;   (testing "FIXME, I fail."
@@ -20,20 +21,20 @@
 (deftest repl-tests
   (testing "quit functionality"
     (with-open [r (reader (string->stream stop-word))]
-      (binding [*in* r]
+      (binding [clojure.core/*in* r
+                *options* (assoc *options* :testing true)]
         (is (thrown-with-msg? Exception #"\nFærwell!" (repl "")))))
-
     (let [expected nil
           actual (with-open [r (reader (string->stream stop-word))]
                    (binding [*in* r]
-                     (-main)))]
+                     (-main "--testing")))]
       (is (= actual expected)))))
 
-;; TODO: not working because STOP is not being recognised, but I haven't
+;; The new read-chars interface is really messing with this. Need to sort out!
-;; worked out why not yet. It *did* work.
+;; OK, binding `:testing` doesn't work because `*options*` gets rebound in main.
-
+;; Need to be able to pass in a testing flag as argument to -main
 (deftest flag-tests
-  (testing "No flags"
+  (testing "Only testing flag"
     (let [expected-greeting "Hider wilcuman. Béowulf is mín nama."
           expected-quit-message (str "Sprecan '" stop-word "' tó laéfan")
           expected-result #".*\(3 \. 4\)"
@@ -41,24 +42,22 @@
           expected-signoff "Færwell!"
           ;; anticipated output (note blank lines):
 
-          ; Hider wilcuman. Béowulf is mín nama.
+          ;; Hider wilcuman. Béowulf is mín nama.
 
-          ; Sprecan 'STOP' tó laéfan
+          ;; Sprecan 'STOP' tó laéfan
 
-          ; Sprecan:: >  (3 . 4)
+          ;; Sprecan:: >  (3 . 4)
-          ; Sprecan:: 
+          ;; Sprecan:: 
-          ; Færwell!
+          ;; Færwell!
           [_ greeting _ _ quit-message _ result prompt signoff]
           (with-open [r (reader (string->stream (str "cons[3; 4]\n" stop-word)))]
             (binding [*in* r]
-              (split (with-out-str (-main)) #"\n")))]
+              (split (with-out-str (-main "--testing")) #"\n")))]
       (is (= greeting expected-greeting))
-      ; (is (= error expected-error))
       (is (re-matches expected-result result))
       (is (= quit-message expected-quit-message))
       (is (= prompt expected-prompt))
-      (is (= signoff expected-signoff))
+      (is (= signoff expected-signoff))))
-      ))
   (testing "unknown flag"
     (let [expected-greeting "Hider wilcuman. Béowulf is mín nama."
           expected-quit-message (str "Sprecan '" stop-word "' tó laéfan")
@@ -69,115 +68,63 @@
           [_ greeting _ error quit-message _ result prompt signoff]
           (with-open [r (reader (string->stream (str "cons[5; 6]\n" stop-word)))]
             (binding [*in* r]
-              (split (with-out-str (-main "--unknown")) #"\n")))]
+              (split (with-out-str (-main "--unknown" "--testing")) #"\n")))]
       (is (= greeting expected-greeting))
       (is (re-matches expected-error error))
       (is (re-matches expected-result result))
       (is (= quit-message expected-quit-message))
       (is (= prompt expected-prompt))
-      (is (= signoff expected-signoff))
+      (is (= signoff expected-signoff))))
-      ))
+;; ;; TODO: not working because STOP is not being recognised, but I haven't
-  ; (testing "help"
+;; ;; worked out why not yet. It *did* work.
-  ;   (let [expected-greeting "Hider wilcuman. Béowulf is mín nama."
+
-  ;         expected-h1 "  -h, --help"
+;; Hider wilcuman. Béowulf is mín nama.
-  ;         expected-quit-message (str "Sprecan '" stop-word "' tó laéfan")
+;;   -f FILEPATH, --file-path FILEPATH               Set the path to the directory for reading and writing Lisp files.
-  ;         expected-result #".*\(A \. B\)"
+;;   -h, --help
-  ;         expected-prompt "Sprecan:: "
+;;   -p PROMPT, --prompt PROMPT         Sprecan::    Set the REPL prompt to PROMPT
-  ;         expected-signoff "Færwell!"
+;;   -r SYSOUTFILE, --read SYSOUTFILE   lisp1.5.lsp  Read Lisp system from file SYSOUTFILE
-  ;         [_ greeting _ h1 _ _ _ _ quit-message _ result prompt signoff]
+;;   -s, --strict                                    Strictly interpret the Lisp 1.5 language, without extensions.
-  ;         (with-open [r (reader (string->stream (str "cons[A; B]\n" stop-word)))]
+;;   -t, --time                                      Time evaluations.
-  ;                  (binding [*in* r]
+;;   -x, --testing                                   Disable the jline reader - useful when piping input.
-  ;                    (split (with-out-str (-main "--help")) #"\n")))]
+;; Sprecan 'STOP' tó laéfan
-  ;     (is (= greeting expected-greeting))
+
-  ;     (is (= h1 expected-h1))
+;; Sprecan:: 
-  ;     (is (re-matches expected-result result))
+
-  ;     (is (= quit-message expected-quit-message))
+  (testing "help"
-  ;     (is (= prompt expected-prompt))
+    (let [expected-greeting "Hider wilcuman. Béowulf is mín nama."
-  ;     (is (= signoff expected-signoff))
+          expected-h1 "  -h, --help"
-  ;     ))
+          expected-quit-message (str "Sprecan '" stop-word "' tó laéfan")
-  ; (testing "prompt"
+          expected-result #".*\(A \. B\)"
-  ;   (let [expected-greeting "Hider wilcuman. Béowulf is mín nama."
+          expected-prompt "Sprecan:: "
-  ;         expected-quit-message (str "Sprecan '" stop-word "' tó laéfan")
+          expected-signoff "Færwell!"
-  ;         expected-error ""
+          [_ greeting _ _ h1 _ _ _ _ _ quit-message _ result prompt signoff]
-  ;         expected-result #".*\(A \. B\).*"
+          (with-open [r (reader (string->stream (str "cons[A; B]\n" stop-word)))]
-  ;         expected-prompt "? "
+            (binding [*in* r]
-  ;         expected-signoff "Færwell!"
+              (split (with-out-str (-main "--help" "--testing")) #"\n")))]
-  ;         [_ greeting _ error quit-message _ result prompt signoff]
+      (is (= greeting expected-greeting))
-  ;         (with-open [r (reader (string->stream (str stop-word)))]
+      (is (= h1 expected-h1))
-  ;           (binding [*in* r]
+      (is (re-matches expected-result result))
-  ;             (split (with-out-str (-main "--prompt" "?")) #"\n")))]
+      (is (= quit-message expected-quit-message))
-  ;     (is (= greeting expected-greeting))
+      (is (starts-with? prompt expected-prompt))
-  ;     (is (= error expected-error))
+      (is (= signoff expected-signoff))))
-  ;     (is (re-matches expected-result result ))
+  (testing "prompt"
-  ;     (is (= quit-message expected-quit-message))
+    (let [expected-prompt "? "
-  ;     (is (= prompt expected-prompt))
+          [_ _ _ _ _ _ prompt _]
-  ;     (is (= signoff expected-signoff))
+          (with-open [r (reader (string->stream stop-word))]
-  ;     ))
+            (binding [*in* r]
-  ; (testing "read - file not found"
+              (split (with-out-str (-main "--prompt" "?" "--testing")) #"\n")))]
-  ;   (let [expected-greeting "Hider wilcuman. Béowulf is mín nama."
+      (is (= prompt expected-prompt))))
-  ;         expected-quit-message (str "Sprecan '" stop-word "' tó laéfan")
+   (testing "read - file not found"
-  ;         expected-error #"Failed to validate.*"
+     (let [expected-error #"Failed to validate.*"
-  ;         expected-result #".*\(A \. B\)"
+           [_ _ _ error _ _ _ _ _]
-  ;         expected-prompt "Sprecan:: "
+           (with-open [r (reader (string->stream (str "cons[A; B]\n" stop-word)))]
-  ;         expected-signoff "Færwell!"
+             (binding [*in* r]
-  ;         [_ greeting _ error quit-message _ result prompt signoff]
+               (split (with-out-str (-main "--testing" "--read" "froboz")) #"\n")))]
-  ;         (with-open [r (reader (string->stream (str "cons[A; B]\n" stop-word)))]
+       (is (re-matches expected-error error))))
-  ;           (binding [*in* r]
+   (testing "strict"
-  ;             (split (with-out-str (-main "--read" "froboz")) #"\n")))]
+     (let [expected-result #".*Cannot parse meta expressions in strict mode.*"
-  ;     (is (= greeting expected-greeting))
+           [_ _ _ _ _ _ result _ _]
-  ;     (is (re-matches expected-error error))
+           (with-open [r (reader (string->stream (str "cons[A; B]\n" stop-word)))]
-  ;     (is (re-matches expected-result result))
+             (binding [*in* r]
-  ;     (is (= quit-message expected-quit-message))
+               (split (with-out-str (-main "--strict" "--testing")) #"\n")))]
-  ;     (is (= prompt expected-prompt))
+       (is (re-matches expected-result result )))))
-  ;     (is (= signoff expected-signoff))
-  ;     ))
-  ; (testing "read - file found"
-  ;   ;; TODO: there's no feedback from this because the initfile
-  ;   ;; is not yet read. This will change
-  ;   (let [expected-greeting "Hider wilcuman. Béowulf is mín nama."
-  ;         expected-quit-message (str "Sprecan '" stop-word "' tó laéfan")
-  ;         expected-error ""
-  ;         expected-result #".*\(A \. B\)"
-  ;         expected-prompt "Sprecan:: "
-  ;         expected-signoff "Færwell!"
-  ;         [_ greeting error quit-message _ _ result prompt signoff]
-  ;         (with-open [r (reader (string->stream (str "cons[A; B]\n" stop-word)))]
-  ;           (binding [*in* r]
-  ;             (split (with-out-str (-main "--read" "README.md")) #"\n")))]
-  ;     (is (= greeting expected-greeting))
-  ;     (is (= error expected-error))
-  ;     (is (re-matches expected-result result))
-  ;     (is (= quit-message expected-quit-message))
-  ;     (is (= prompt expected-prompt))
-  ;     (is (= signoff expected-signoff))
-  ;     ))
-  ; (testing "strict"
-  ;   (let [expected-greeting "Hider wilcuman. Béowulf is mín nama."
-  ;         expected-quit-message (str "Sprecan '" stop-word "' tó laéfan")
-  ;         expected-error ""
-  ;         expected-result #".*Cannot parse meta expressions in strict mode.*"
-  ;         expected-prompt "Sprecan:: "
-  ;         expected-signoff "Færwell!"
-  ;         [_ greeting _ error quit-message _ result prompt signoff]
-  ;         (with-open [r (reader (string->stream (str "cons[A; B]\n" stop-word)))]
-  ;           (binding [*in* r]
-  ;             (split (with-out-str (-main "--strict")) #"\n")))]
-  ;     (is (= greeting expected-greeting))
-  ;     (is (= error expected-error))
-  ;     (is (re-matches expected-result result ))
-  ;     (is (= quit-message expected-quit-message))
-  ;     (is (= prompt expected-prompt))
-  ;     (is (= signoff expected-signoff))
-  ;     ))
-  ; ; (testing "trace"
-  ;   (let [expected-greeting "Hider wilcuman. Béowulf is mín nama."
-  ;         expected-error ""
-  ;         expected-trace #".*traced-eval.*"
-  ;         [_ greeting _ error _ _ trace & _]
-  ;         (with-open [r (reader (string->stream (str "cons[A; B]\n" stop-word)))]
-  ;           (binding [*in* r]
-  ;             (split (with-out-str (-main "--trace")) #"\n")))]
-  ;     (is (= greeting expected-greeting))
-  ;     (is (= error expected-error))
-  ;     (is (re-matches expected-trace trace))
-)

test/beowulf/host_test.clj

@@ -1,38 +1,66 @@
 (ns beowulf.host-test
-  (:require [clojure.test :refer [deftest is testing]]
+  (:require [beowulf.cons-cell :refer [F make-beowulf-list make-cons-cell T]]
-            [beowulf.cons-cell :refer [F make-beowulf-list T]] 
+            [beowulf.host :refer [ADD1 AND CADDDR CAR CDR DEFINE DIFFERENCE
-            [beowulf.host :refer [CDR DIFFERENCE NUMBERP PLUS RPLACA RPLACD TIMES]]
+                                  ERROR FIXP GREATERP lax? LESSP NILP NULL
-            [beowulf.oblist :refer [NIL]]
+                                  NUMBERP OR PLUS RPLACA RPLACD SUB1 TIMES uaf]]
-            [beowulf.read :refer [gsp]]))
+            [beowulf.io :refer [SYSIN]]
+            [beowulf.oblist :refer [*options* NIL]]
+            [beowulf.read :refer [gsp]]
+            [clojure.test :refer [deftest is testing use-fixtures]]
+            [expectations.clojure.test
+             :refer [defexpect expect more-> more-of]]))
+
+(use-fixtures :once (fn [f]
+                      (try (when (SYSIN "resources/lisp1.5.lsp")
+                             (f))
+                           (catch Throwable any
+                             (throw (ex-info "Failed to load Lisp sysout"
+                                             {:phase test
+                                              :function 'SYSIN
+                                              :file "resources/lisp1.5.lsp"}
+                                             any))))))
 
 (deftest destructive-change-test
   (testing "RPLACA"
     (let
-      [l (make-beowulf-list '(A B C D E))
+     [l (make-beowulf-list '(A B C D E))
-       target (CDR l)
+      target (CDR l)
-       expected "(A F C D E)"
+      expected "(A F C D E)"
-       actual (do (RPLACA target 'F) (print-str l))]
+      actual (do (RPLACA target 'F) (print-str l))]
       (is (= actual expected)))
     (is (thrown-with-msg?
-          Exception
+         Exception
-          #"Un-ġefōg þing in RPLACA.*"
+         #"Un-ġefōg þing in RPLACA.*"
-          (RPLACA (make-beowulf-list '(A B C D E)) "F"))
+         (RPLACA (make-beowulf-list '(A B C D E)) "F"))
         "You can't represent a string in Lisp 1.5")
     (is (thrown-with-msg?
-          Exception
+         Exception
-          #"Uncynlic miercels in RPLACA.*"
+         #"Uncynlic miercels in RPLACA.*"
-          (RPLACA '(A B C D E) 'F))
+         (RPLACA '(A B C D E) 'F))
-        "You can't RPLACA into anything which isn't a MutableSequence.")
+        "You can't RPLACA into anything which isn't a MutableSequence."))
-    )
+  (testing "RPLACD"
-  (testing "RPLACA"
     (let
-      [l (make-beowulf-list '(A B C D E))
+     [l (make-beowulf-list '(A B C D E))
-       target (CDR l)
+      target (CDR l)
-       expected "(A B . F)"
+      expected "(A B . F)"
-       actual (do (RPLACD target 'F) (print-str l))]
+      actual (do (RPLACD target 'F) (print-str l))]
       (is (= actual expected)))
-    )
+    (let
-  )
+     [l (make-beowulf-list '(A B C D E))
+      target (CDR l)
+      expected "(A B)"
+      actual (do (RPLACD target NIL) (print-str l))]
+      (is (= actual expected)))
+    (is (thrown-with-msg?
+         Exception
+         #"Un-ġefōg þing in RPLACD.*"
+         (RPLACD (make-beowulf-list '(A B C D E)) :a))
+        "You can't represent a keyword in Lisp 1.5")
+    (is (thrown-with-msg?
+         Exception
+         #"Uncynlic miercels in RPLACD.*"
+         (RPLACD "ABCDE" 'F))
+        "You can't RPLACD into anything which isn't a MutableSequence.")))
 
 (deftest numberp-tests
   (testing "NUMBERP"
@@ -59,12 +87,171 @@
     (let [expected 3.5
           actual (PLUS 1.25 9/4)]
       (is (= actual expected))
+      (is (float? actual)))
+    (let [expected 3.5
+          actual (PLUS -2.5 6)]
+      (is (= actual expected) "Negative numbers are cool.")
       (is (float? actual))))
   (testing "TIMES"
     (let [expected 6
           actual (TIMES 2 3)]
+      (is (= actual expected)))
+    (let [expected 2.5
+          actual (TIMES 5 0.5)]
       (is (= actual expected))))
-  (testing DIFFERENCE
+  (testing "DIFFERENCE"
     (let [expected -1
           actual (DIFFERENCE 1 2)]
+      (is (= actual expected)))
+    (let [expected (float 0.1)
+          actual (DIFFERENCE -0.1 -0.2)]
+      (is (= actual expected))))
+  (testing "ADD1"
+    (let [expected -1
+          actual (ADD1 -2)]
+      (is (= actual expected)))
+    (let [expected (float 3.5)
+          actual (ADD1 2.5)]
+      (is (= actual expected))))
+  (testing "SUB1"
+    (let [expected -3
+          actual (SUB1 -2)]
+      (is (= actual expected)))
+    (let [expected (float 1.5)
+          actual (SUB1 2.5)]
       (is (= actual expected)))))
+
+(deftest laxness
+  (testing "lax"
+    (let [expected true
+          actual (lax? 'Test)]
+      (is (= actual expected) "Pass, the Queen's Cat, and all's well")))
+  (testing "strict"
+    (binding [*options* (assoc *options* :strict true)]
+      (is (thrown-with-msg? Exception #".*ne āfand innan Lisp 1.5" (lax? 'Test))))))
+
+(deftest access-tests
+  (testing "primitive access"
+    (let [cell (make-cons-cell 1 7)]
+      (let [expected 1
+            actual (CAR cell)]
+        (is (= actual expected)))
+      (let [expected 7
+            actual (CDR cell)]
+        (is (= actual expected))))
+    (is (thrown-with-msg? Exception #".*Ne can tace CAR of.*" (CAR 7)))
+    (is (thrown-with-msg? Exception #".*Ne can tace CDR of.*" (CDR 'A)))
+    (is (thrown-with-msg? Exception #".*Ne liste.*" (CADDDR "Foo")))
+    (is (thrown-with-msg? Exception #".*uaf: unexpected letter in path.*"
+                          (uaf (make-beowulf-list '(A B C D))
+                               '(\d \a \z \e \d))))))
+
+(deftest misc-predicate-tests
+  (testing "NULL"
+    (let [expected T
+          actual (NULL NIL)]
+      (is (= actual expected)))
+    (let [expected F
+          actual (NULL (make-beowulf-list '(A B C)))]
+      (is (= actual expected))))
+  (testing "NILP"
+    (let [expected T
+          actual (NILP NIL)]
+      (is (= actual expected)))
+    (let [expected NIL
+          actual (NILP (make-beowulf-list '(A B C)))]
+      (is (= actual expected))))
+  (testing "AND"
+    (let [expected T
+          actual (AND)]
+      (is (= actual expected)))
+    (let [expected T
+          actual (AND T T)]
+      (is (= actual expected)))
+    (let [expected T
+          actual (AND T T T)]
+      (is (= actual expected)))
+    (let [expected T
+          actual (AND 1 'A (make-beowulf-list '(A B C)))]
+      (is (= actual expected)))
+    (let [expected F
+          actual (AND NIL)]
+      (is (= actual expected)))
+    (let [expected F
+          actual (AND T T F T)]
+      (is (= actual expected))))
+  (testing "OR"
+    (let [expected F
+          actual (OR)]
+      (is (= actual expected)))
+    (let [expected T
+          actual (OR NIL T)]
+      (is (= actual expected)))
+    (let [expected T
+          actual (OR T F T)]
+      (is (= actual expected)))
+    (let [expected T
+          actual (OR 1 F (make-beowulf-list '(A B C)))]
+      (is (= actual expected)))
+    (let [expected F
+          actual (OR NIL)]
+      (is (= actual expected)))
+    (let [expected F
+          actual (OR NIL F)]
+      (is (= actual expected))))
+  (testing "FIXP"
+    (let [expected F
+          actual (FIXP NIL)]
+      (is (= actual expected)))
+    (let [expected F
+          actual (FIXP 'A)]
+      (is (= actual expected)))
+    (let [expected F
+          actual (FIXP 3.2)]
+      (is (= actual expected)))
+    (let [expected T
+          actual (FIXP 7)]
+      (is (= actual expected)))) 
+  (testing "LESSP"
+    (let [expected F
+          actual (LESSP 7 3)]
+      (is (= actual expected)))
+    (let [expected T
+          actual (LESSP -7 3.5)]
+      (is (= actual expected)))
+    (let [expected F
+          actual (LESSP 3.14 3.14)]
+      (is (= actual expected))))
+  (testing "GREATERP"
+    (let [expected T
+          actual (GREATERP 7 3)]
+      (is (= actual expected)))
+    (let [expected F
+          actual (GREATERP -7 3.5)]
+      (is (= actual expected)))
+    (let [expected F
+          actual (GREATERP 3.14 3.14)]
+      (is (= actual expected)))))
+
+;; Really tricky to get DEFINE set up for testing here. It works OK in the
+;; REPL, but there's nonsense going on with lazy sequences. Better to 
+;; reimplement in Lisp.
+;; (deftest define-tests
+;;   (testing "DEFINE"
+;;     (let [expected "(FF)"
+;;          actual (str (doall (DEFINE 
+;;                       (gsp "((FF LAMBDA (X) (COND ((ATOM X) X) (T (FF (CAR X))))))"))))]
+;;     (is (= actual expected)))))
+
+(defexpect error-without-code
+  (expect (more-> clojure.lang.ExceptionInfo type
+                  (more-of {:keys [:phase :function :args :type :code]}
+                           'A1 code) ex-data)
+          (ERROR)))
+
+(defexpect error-with-code
+  (let [x 'X1]
+    (expect (more-> clojure.lang.ExceptionInfo type
+                  (more-of {:keys [:phase :function :args :type :code]}
+                           x code) ex-data)
+          (ERROR x))))

test/beowulf/lisp_test.clj

@@ -1,11 +1,11 @@
 (ns beowulf.lisp-test
   "The idea here is to test actual Lisp functions"
-  (:require [clojure.test :refer [deftest testing is use-fixtures]]
+  (:require [beowulf.bootstrap :refer [EVAL]]
-            [beowulf.bootstrap :refer [EVAL]]
             [beowulf.cons-cell :refer [make-beowulf-list]]
-            [beowulf.io :refer [SYSIN]]
+            [beowulf.io :refer [SYSIN]] ;; [beowulf.oblist :refer [NIL]]
-            ;; [beowulf.oblist :refer [NIL]]
+            [beowulf.oblist :refer [NIL]]
-            [beowulf.read :refer [READ]]))
+            [beowulf.read :refer [READ]]
+            [clojure.test :refer [deftest is testing use-fixtures]]))
 
 (defn- reps
   "'Read eval print string', or 'read eval print single'.
@@ -166,3 +166,41 @@
     (COND ((EQ X 5) (RETURN X))
         (T (GO START))))")]
       (is (= actual expected)))))
+
+
+(deftest put-get-tests
+  (let [symbol 'TESTSYMBOL
+        p1 'TESTPROPONE
+        p2 'TESTPROPTWO]
+    (testing "GET - property should be missing"
+      (let [expected "NIL"
+            actual (reps "(GET 'TESTSYMBOL 'TESTPROPONE)")]
+        (is (= actual expected))))
+    (testing "PUT and GET: value of new property; change value of property"
+      (let [prop (reps "(GENSYM)")
+            val1 (reps "(GENSYM)")
+            val2 (reps "(GENSYM)")
+            expected1 val1
+            actual1 (when (reps (str "(PUT '" symbol " '" prop " '" val1 ")"))
+                      (reps (str "(GET '" symbol " '" prop ")")))
+            expected2 val2
+            actual2 (when (reps (str "(PUT '" symbol " '" prop " '" val2 ")"))
+                      (reps (str "(GET '" symbol " '" prop ")")))]
+        (is (not= val1 val2))
+        (is (= actual1 expected1) "The value set can be retrieved.")
+        (is (= actual2 expected2) "The value is changed.")))
+    (testing "PUT and GET: different properties have independent values"
+      (let [val1 (reps "(GENSYM)")
+            val2 (reps "(GENSYM)")
+            expected1 val1
+            actual1 (when (reps (str "(PUT '" symbol " '" p1 " '" val1 ")"))
+                      (reps (str "(GET '" symbol " '" p1 ")")))
+            expected2 val2
+            actual2 (when (reps (str "(PUT '" symbol " '" p2 " '" val2 ")"))
+                      (reps (str "(GET '" symbol " '" p2 ")")))
+            expected3 val1
+            actual3 (reps (str "(GET '" symbol " '" p1 ")"))]
+        (is (not= val1 val2))
+        (is (= actual1 expected1) "The value set can be retrieved.")
+        (is (= actual2 expected2) "Values are independent.")
+        (is (= actual3 expected3) "Setting a second property does not obliterate the first.")))))