Compare commits
2 commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Simon Brooke
|
a0fc8a3e67 | ||
|
Simon Brooke
|
71fa15462d |
4
.gitignore
vendored
4
.gitignore
vendored
|
|
@ -21,7 +21,3 @@ Sysout*.lsp
|
|||
*.pdf
|
||||
|
||||
src/beowulf/scratch.clj
|
||||
|
||||
.portal/vs-code.edn
|
||||
|
||||
.portal/
|
||||
|
|
|
|||
168
README.md
168
README.md
|
|
@ -38,7 +38,7 @@ LISP 1.5 is to all Lisp dialects as Beowulf is to English literature.
|
|||
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.
|
||||
same behaviour — except as documented below.
|
||||
|
||||
### BUT WHY?!!?!
|
||||
|
||||
|
|
@ -62,14 +62,11 @@ Working Lisp interpreter, but some key features not yet implemented.
|
|||
|
||||
### Project Target
|
||||
|
||||
The project target is to be able to run the [Wang algorithm for the propositional calculus](https://www.softwarepreservation.org/projects/LISP/book/LISP%201.5%20Programmers%20Manual.pdf#page=52) given in chapter 8 of the *Lisp 1.5 Programmer's Manual*. 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.
|
||||
The project target is to be able to run the [Wang algorithm for the propositional calculus](https://www.softwarepreservation.org/projects/LISP/book/LISP%201.5%20Programmers%20Manual.pdf#page=52) given in chapter 8 of the *Lisp 1.5 Programmer's Manual*. 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.
|
||||
|
||||
Some `readline`-like functionality would be really useful, but my attempt to
|
||||
integrate [JLine](https://github.com/jline/jline3) has not (yet) been successful.
|
||||
Some `readline`-like functionality would be really useful, but my attempt to integrate [JLine](https://github.com/jline/jline3) has not (yet) been successful.
|
||||
|
||||
An in-core structure editor would be an extremely nice thing, and I may well
|
||||
implement one.
|
||||
An in-core structure editor would be an extremely nice thing, and I may well implement one.
|
||||
|
||||
You are of course welcome to fork the project and do whatever you like with it!
|
||||
|
||||
|
|
@ -77,7 +74,7 @@ You are of course welcome to fork the project and do whatever you like with it!
|
|||
|
||||
Invoke with
|
||||
|
||||
java -jar target/uberjar/beowulf-0.3.1-standalone.jar --help
|
||||
java -jar target/uberjar/beowulf-0.3.0-standalone.jar --help
|
||||
|
||||
(Obviously, check your version number)
|
||||
|
||||
|
|
@ -110,53 +107,53 @@ now be possible to reimplement them as `FEXPRs` and so the reader macro function
|
|||
|
||||
| Function | Type | Signature | Implementation | Documentation |
|
||||
|--------------|----------------|------------------|----------------|----------------------|
|
||||
| NIL | Lisp variable | ? | | see manual pages <a href='#page22'>22</a>, <a href='#page69'>69</a> |
|
||||
| T | Lisp variable | ? | | see manual pages <a href='#page22'>22</a>, <a href='#page69'>69</a> |
|
||||
| F | Lisp variable | ? | | see manual pages <a href='#page22'>22</a>, <a href='#page69'>69</a> |
|
||||
| ADD1 | Host lambda function | ? | | ? |
|
||||
| AND | Host lambda function | ? | PREDICATE | `T` if and only if none of my `args` evaluate to either `F` or `NIL`, else `F`. In `beowulf.host` principally because I don't yet feel confident to define varargs functions in Lisp. |
|
||||
| APPEND | Lisp lambda function | ? | | see manual pages <a href='#page11'>11</a>, <a href='#page61'>61</a> |
|
||||
| APPLY | Host lambda function | ? | | Apply this `function` to these `arguments` in this `environment` and return the result. 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. |
|
||||
| ASSOC | Lisp lambda function, Host lambda function | ? | ? | 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 `beowulf.cons-cell/ConsCell` objects. See page 12 of the Lisp 1.5 Programmers Manual. **NOTE THAT** this function is overridden by an implementation in Lisp, but is currently still present for bootstrapping. |
|
||||
| ATOM | Host lambda function | ? | PREDICATE | Returns `T` if and only if the argument `x` is bound to an atom; else `F`. It is not clear to me from the documentation whether `(ATOM 7)` should return `T` or `F`. I'm going to assume `T`. |
|
||||
| CAR | Host lambda function | ? | | Return the item indicated by the first pointer of a pair. NIL is treated specially: the CAR of NIL is NIL. |
|
||||
| CAAAAR | Lisp lambda function | ? | ? | ? |
|
||||
| CAAADR | Lisp lambda function | ? | ? | ? |
|
||||
| CAAAR | Lisp lambda function | ? | ? | ? |
|
||||
| CAADAR | Lisp lambda function | ? | ? | ? |
|
||||
| CAADDR | Lisp lambda function | ? | ? | ? |
|
||||
| CAADR | Lisp lambda function | ? | ? | ? |
|
||||
| CAAR | Lisp lambda function | ? | ? | ? |
|
||||
| CADAAR | Lisp lambda function | ? | ? | ? |
|
||||
| CADADR | Lisp lambda function | ? | ? | ? |
|
||||
| CADAR | Lisp lambda function | ? | ? | ? |
|
||||
| CADDAR | Lisp lambda function | ? | ? | ? |
|
||||
| CADDDR | Lisp lambda function | ? | ? | ? |
|
||||
| CADDR | Lisp lambda function | ? | ? | ? |
|
||||
| CADR | Lisp lambda function | ? | ? | ? |
|
||||
| CDAAAR | Lisp lambda function | ? | ? | ? |
|
||||
| CDAADR | Lisp lambda function | ? | ? | ? |
|
||||
| CDAAR | Lisp lambda function | ? | ? | ? |
|
||||
| CDADAR | Lisp lambda function | ? | ? | ? |
|
||||
| CDADDR | Lisp lambda function | ? | ? | ? |
|
||||
| CDADR | Lisp lambda function | ? | ? | ? |
|
||||
| CDAR | Lisp lambda function | ? | ? | ? |
|
||||
| CDDAAR | Lisp lambda function | ? | ? | ? |
|
||||
| CDDADR | Lisp lambda function | ? | ? | ? |
|
||||
| CDDAR | Lisp lambda function | ? | ? | ? |
|
||||
| CDDDAR | Lisp lambda function | ? | ? | ? |
|
||||
| CDDDDR | Lisp lambda function | ? | ? | ? |
|
||||
| CDDDR | Lisp lambda function | ? | ? | ? |
|
||||
| CDDR | Lisp lambda function | ? | ? | ? |
|
||||
| CDR | Host lambda function | ? | | Return the item indicated by the second pointer of a pair. NIL is treated specially: the CDR of NIL is NIL. |
|
||||
| CONS | Host lambda function | ? | | Construct a new instance of cons cell with this `car` and `cdr`. |
|
||||
| CONSP | Host lambda function | ? | ? | Return `T` if object `o` is a cons cell, else `F`. **NOTE THAT** 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. |
|
||||
| COPY | Lisp lambda function | ? | | see manual pages <a href='#page62'>62</a> |
|
||||
| DEFINE | Host lambda function | ? | PSEUDO-FUNCTION | Bootstrap-only version of `DEFINE` which, post boostrap, can be overwritten in LISP. The single argument to `DEFINE` should be an association list of symbols to lambda functions. See page 58 of the manual. |
|
||||
| DIFFERENCE | Host lambda function | ? | | ? |
|
||||
| DIVIDE | Lisp lambda function | ? | | see manual pages <a href='#page26'>26</a>, <a href='#page64'>64</a> |
|
||||
| DOC | Host lambda function | ? | ? | Open the page for this `symbol` in the Lisp 1.5 manual, if known, in the default web browser. **NOTE THAT** this is an extension function, not available in strct mode. |
|
||||
| EFFACE | Lisp lambda function | ? | PSEUDO-FUNCTION | see manual pages <a href='#page63'>63</a> |
|
||||
| NIL | Lisp variable | ? | | The canonical empty list. See manual pages <a href='https://www.softwarepreservation.org/projects/LISP/book/LISP%201.5%20Programmers%20Manual.pdf#page=22'>22</a>, <a href='https://www.softwarepreservation.org/projects/LISP/book/LISP%201.5%20Programmers%20Manual.pdf#page=69'>69</a>s |
|
||||
| T | Lisp variable | ? | | The canonical true value. See manual pages <a href='https://www.softwarepreservation.org/projects/LISP/book/LISP%201.5%20Programmers%20Manual.pdf#page=22'>22</a>, <a href='https://www.softwarepreservation.org/projects/LISP/book/LISP%201.5%20Programmers%20Manual.pdf#page=69'>69</a> |
|
||||
| F | Lisp variable | ? | | The canonical false value. See manual pages <a href='https://www.softwarepreservation.org/projects/LISP/book/LISP%201.5%20Programmers%20Manual.pdf#page=22'>22</a>, <a href='https://www.softwarepreservation.org/projects/LISP/book/LISP%201.5%20Programmers%20Manual.pdf#page=69'>69</a> |
|
||||
| ADD1 | Host lambda function | x:number | | Add one to the number `x`. |
|
||||
| AND | Host lambda function | expr* | PREDICATE | `T` if and only if none of my `args` evaluate to either `F` or `NIL`, else `F`. <br><br>In `beowulf.host` principally because I don't yet feel confident to define varargs functions in Lisp. |
|
||||
| APPEND | Lisp lambda function | ? | | see manual pages <a href='https://www.softwarepreservation.org/projects/LISP/book/LISP%201.5%20Programmers%20Manual.pdf#page=11'>11</a>, <a href='https://www.softwarepreservation.org/projects/LISP/book/LISP%201.5%20Programmers%20Manual.pdf#page=61'>61</a> |
|
||||
| APPLY | Host lambda function | ? | | Apply this `function` to these `arguments` in this `environment` and return the result.<br><br>For bootstrapping, at least, a version of APPLY written in Clojure.<br><br>All args are assumed to be symbols or `beowulf.cons-cell/ConsCell` objects.<br><br>See page <a href='https://www.softwarepreservation.org/projects/LISP/book/LISP%201.5%20Programmers%20Manual.pdf#page=13'>13</a> of the Lisp 1.5 Programmers Manual. |
|
||||
| ASSOC | Lisp lambda function, Host lambda function | a:list | ? | 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 `beowulf.cons-cell/ConsCell` objects. See page <a href='https://www.softwarepreservation.org/projects/LISP/book/LISP%201.5%20Programmers%20Manual.pdf#page=12'>12</a> of the Lisp 1.5 Programmers Manual.<br><br>**NOTE THAT** this function is overridden by an implementation in Lisp, but is currently still present for bootstrapping. |
|
||||
| ATOM | Host lambda function | x:expr | PREDICATE | Returns `T` if and only if the argument `x` is bound to an atom; else `F`. It is not clear to me from the documentation whether `(ATOM 7)` should return `T` or `F`. I'm going to assume `T`. |
|
||||
| CAR | Host lambda function | list | | Return the item indicated by the first pointer of a pair. NIL is treated specially: the CAR of NIL is NIL. |
|
||||
| CAAAAR | Lisp lambda function | list | ? | ? |
|
||||
| CAAADR | Lisp lambda function | list | ? | ? |
|
||||
| CAAAR | Lisp lambda function | list | ? | ? |
|
||||
| CAADAR | Lisp lambda function | list | ? | ? |
|
||||
| CAADDR | Lisp lambda function | list | ? | ? |
|
||||
| CAADR | Lisp lambda function | list | ? | ? |
|
||||
| CAAR | Lisp lambda function | list | ? | ? |
|
||||
| CADAAR | Lisp lambda function | list | ? | ? |
|
||||
| CADADR | Lisp lambda function | list | ? | ? |
|
||||
| CADAR | Lisp lambda function | list | ? | ? |
|
||||
| CADDAR | Lisp lambda function | list | ? | ? |
|
||||
| CADDDR | Lisp lambda function | list | ? | ? |
|
||||
| CADDR | Lisp lambda function | list | ? | ? |
|
||||
| CADR | Lisp lambda function | list | ? | ? |
|
||||
| CDAAAR | Lisp lambda function | list | ? | ? |
|
||||
| CDAADR | Lisp lambda function | list | ? | ? |
|
||||
| CDAAR | Lisp lambda function | list | ? | ? |
|
||||
| CDADAR | Lisp lambda function | list | ? | ? |
|
||||
| CDADDR | Lisp lambda function | list | ? | ? |
|
||||
| CDADR | Lisp lambda function | list | ? | ? |
|
||||
| CDAR | Lisp lambda function | list | ? | ? |
|
||||
| CDDAAR | Lisp lambda function | list | ? | ? |
|
||||
| CDDADR | Lisp lambda function | list | ? | ? |
|
||||
| CDDAR | Lisp lambda function | list | ? | ? |
|
||||
| CDDDAR | Lisp lambda function | list | ? | ? |
|
||||
| CDDDDR | Lisp lambda function | list | ? | ? |
|
||||
| CDDDR | Lisp lambda function | list | ? | ? |
|
||||
| CDDR | Lisp lambda function | list | ? | ? |
|
||||
| CDR | Host lambda function | list | | Return the item indicated by the second pointer of a pair. NIL is treated specially: the CDR of NIL is NIL. |
|
||||
| CONS | Host lambda function | expr, expr | | Construct a new instance of cons cell with this `car` and `cdr`. |
|
||||
| CONSP | Host lambda function | o:expr | ? | Return `T` if object `o` is a cons cell, else `F`.<br><br>**NOTE THAT** this is an extension function, not available in strict mode. I believe that Lisp 1.5 did not have any mechanism for testing whether an argument was, or was not, a cons cell. |
|
||||
| COPY | Lisp lambda function | ? | | see manual pages <a href='https://www.softwarepreservation.org/projects/LISP/book/LISP%201.5%20Programmers%20Manual.pdf#page=62'>62</a> |
|
||||
| DEFINE | Host lambda function | ? | PSEUDO-FUNCTION | Bootstrap-only version of `DEFINE` which, post boostrap, can be overwritten in LISP. The single argument to `DEFINE` should be an association list of symbols to lambda functions. See page <a href='https://www.softwarepreservation.org/projects/LISP/book/LISP%201.5%20Programmers%20Manual.pdf#page=58'>58</a> of the manual. |
|
||||
| DIFFERENCE | Host lambda function | x:number, y:number | | Returns the result of subtracting the number `y` from the number `x` |
|
||||
| DIVIDE | Lisp lambda function | x:number, y:number | | see manual pages <a href='https://www.softwarepreservation.org/projects/LISP/book/LISP%201.5%20Programmers%20Manual.pdf#page=26'>26</a>, <a href='https://www.softwarepreservation.org/projects/LISP/book/LISP%201.5%20Programmers%20Manual.pdf#page=64'>64</a> |
|
||||
| DOC | Host lambda function | ? | ? | Open the page for this `symbol` in the Lisp 1.5 manual, if known, in the default web browser.<br><br>**NOTE THAT** this is an extension function, not available in strct mode. |
|
||||
| EFFACE | Lisp lambda function | ? | PSEUDO-FUNCTION | see manual pages <a href='https://www.softwarepreservation.org/projects/LISP/book/LISP%201.5%20Programmers%20Manual.pdf#page=63'>63</a> |
|
||||
| ERROR | Host lambda function | ? | PSEUDO-FUNCTION | Throw an error |
|
||||
| EQ | Host lambda function | ? | PREDICATE | Returns `T` if and only if both `x` and `y` are bound to the same atom, else `NIL`. |
|
||||
| EQUAL | Host lambda function | ? | PREDICATE | This is a predicate that is true if its two arguments are identical S-expressions, and false if they are different. (The elementary predicate `EQ` is defined only for atomic arguments.) The definition of `EQUAL` is an example of a conditional expression inside a conditional expression. NOTE: returns `F` on failure, not `NIL` |
|
||||
|
|
@ -164,50 +161,50 @@ now be possible to reimplement them as `FEXPRs` and so the reader macro function
|
|||
| FACTORIAL | Lisp lambda function | ? | ? | ? |
|
||||
| FIXP | Host lambda function | ? | PREDICATE | ? |
|
||||
| GENSYM | Host lambda function | ? | | Generate a unique symbol. |
|
||||
| GET | Host lambda function | ? | | From the manual: '`get` is somewhat like `prop`; however its value is car of the rest of the list if the `indicator` is found, and NIL otherwise.' It's clear that `GET` is expected to be defined in terms of `PROP`, but we can't implement `PROP` here because we lack `EVAL`; and we can't have `EVAL` here because both it and `APPLY` depends on `GET`. OK, It's worse than that: the statement of the definition of `GET` (and of) `PROP` on page 59 says that the first argument to each must be a list; But the in the definition of `ASSOC` on page 70, when `GET` is called its first argument is always an atom. Since it's `ASSOC` and `EVAL` which I need to make work, I'm going to assume that page 59 is wrong. |
|
||||
| GET | Host lambda function | ? | | From the manual: '`get` is somewhat like `prop`; however its value is car of the rest of the list if the `indicator` is found, and NIL otherwise.'<br><br>It's clear that `GET` is expected to be defined in terms of `PROP`, but we can't implement `PROP` here because we lack `EVAL`; and we can't have `EVAL` here because both it and `APPLY` depends on `GET`.<br><br>OK, It's worse than that: the statement of the definition of `GET` (and of) `PROP` on page <a href='https://www.softwarepreservation.org/projects/LISP/book/LISP%201.5%20Programmers%20Manual.pdf#page=59'>59</a> says that the first argument to each must be a list; But the in the definition of `ASSOC` on page 70, when `GET` is called its first argument is always an atom. Since it's `ASSOC` and `EVAL` which I need to make work, I'm going to assume that page 59 is wrong. |
|
||||
| GREATERP | Host lambda function | ? | PREDICATE | ? |
|
||||
| INTEROP | Host lambda function | ? | ? | ? |
|
||||
| INTERSECTION | Lisp lambda function | ? | ? | ? |
|
||||
| LENGTH | Lisp lambda function | ? | | see manual pages <a href='#page62'>62</a> |
|
||||
| LENGTH | Lisp lambda function | ? | | see manual pages <a href='https://www.softwarepreservation.org/projects/LISP/book/LISP%201.5%20Programmers%20Manual.pdf#page=62'>62</a> |
|
||||
| LESSP | Host lambda function | ? | PREDICATE | ? |
|
||||
| MAPLIST | Lisp lambda function | ? | FUNCTIONAL | see manual pages <a href='#page20'>20</a>, <a href='#page21'>21</a>, <a href='#page63'>63</a> |
|
||||
| MEMBER | Lisp lambda function | ? | PREDICATE | see manual pages <a href='#page11'>11</a>, <a href='#page62'>62</a> |
|
||||
| MINUSP | Lisp lambda function | ? | PREDICATE | see manual pages <a href='#page26'>26</a>, <a href='#page64'>64</a> |
|
||||
| NOT | Lisp lambda function | ? | PREDICATE | see manual pages <a href='#page21'>21</a>, <a href='#page23'>23</a>, <a href='#page58'>58</a> |
|
||||
| NULL | Lisp lambda function | ? | PREDICATE | see manual pages <a href='#page11'>11</a>, <a href='#page57'>57</a> |
|
||||
| MAPLIST | Lisp lambda function | ? | FUNCTIONAL | see manual pages <a href='https://www.softwarepreservation.org/projects/LISP/book/LISP%201.5%20Programmers%20Manual.pdf#page=20'>20</a>, <a href='https://www.softwarepreservation.org/projects/LISP/book/LISP%201.5%20Programmers%20Manual.pdf#page=21'>21</a>, <a href='https://www.softwarepreservation.org/projects/LISP/book/LISP%201.5%20Programmers%20Manual.pdf#page=63'>63</a> |
|
||||
| MEMBER | Lisp lambda function | ? | PREDICATE | see manual pages <a href='https://www.softwarepreservation.org/projects/LISP/book/LISP%201.5%20Programmers%20Manual.pdf#page=11'>11</a>, <a href='https://www.softwarepreservation.org/projects/LISP/book/LISP%201.5%20Programmers%20Manual.pdf#page=62'>62</a> |
|
||||
| MINUSP | Lisp lambda function | ? | PREDICATE | see manual pages <a href='https://www.softwarepreservation.org/projects/LISP/book/LISP%201.5%20Programmers%20Manual.pdf#page=26'>26</a>, <a href='https://www.softwarepreservation.org/projects/LISP/book/LISP%201.5%20Programmers%20Manual.pdf#page=64'>64</a> |
|
||||
| NOT | Lisp lambda function | ? | PREDICATE | see manual pages <a href='https://www.softwarepreservation.org/projects/LISP/book/LISP%201.5%20Programmers%20Manual.pdf#page=21'>21</a>, <a href='https://www.softwarepreservation.org/projects/LISP/book/LISP%201.5%20Programmers%20Manual.pdf#page=23'>23</a>, <a href='https://www.softwarepreservation.org/projects/LISP/book/LISP%201.5%20Programmers%20Manual.pdf#page=58'>58</a> |
|
||||
| NULL | Lisp lambda function | ? | PREDICATE | see manual pages <a href='https://www.softwarepreservation.org/projects/LISP/book/LISP%201.5%20Programmers%20Manual.pdf#page=11'>11</a>, <a href='https://www.softwarepreservation.org/projects/LISP/book/LISP%201.5%20Programmers%20Manual.pdf#page=57'>57</a> |
|
||||
| NUMBERP | Host lambda function | ? | PREDICATE | ? |
|
||||
| OBLIST | Host lambda function | ? | | Return a list of the symbols currently bound on the object list. **NOTE THAT** 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. |
|
||||
| ONEP | Lisp lambda function | ? | PREDICATE | see manual pages <a href='#page26'>26</a>, <a href='#page64'>64</a> |
|
||||
| OR | Host lambda function | ? | PREDICATE | `T` if and only if at least one of my `args` evaluates to something other than either `F` or `NIL`, else `F`. In `beowulf.host` principally because I don't yet feel confident to define varargs functions in Lisp. |
|
||||
| PAIR | Lisp lambda function | ? | | see manual pages <a href='#page60'>60</a> |
|
||||
| PAIRLIS | Lisp lambda function, Host lambda function | ? | ? | This function gives the list of pairs of corresponding elements of the lists `x` and `y`, and APPENDs this to the list `a`. 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 `beowulf.cons-cell/ConsCell` objects. See page 12 of the Lisp 1.5 Programmers Manual. **NOTE THAT** this function is overridden by an implementation in Lisp, but is currently still present for bootstrapping. |
|
||||
| OBLIST | Host lambda function | ? | | Return a list of the symbols currently bound on the object list.<br><br>**NOTE THAT** in the Lisp 1.5 manual, footnote at the bottom of page <a href='https://www.softwarepreservation.org/projects/LISP/book/LISP%201.5%20Programmers%20Manual.pdf#page=69'>69</a>, it implies that an argument can be passed but I'm not sure of the semantics of this. |
|
||||
| ONEP | Lisp lambda function | ? | PREDICATE | see manual pages <a href='https://www.softwarepreservation.org/projects/LISP/book/LISP%201.5%20Programmers%20Manual.pdf#page=26'>26</a>, <a href='https://www.softwarepreservation.org/projects/LISP/book/LISP%201.5%20Programmers%20Manual.pdf#page=64'>64</a> |
|
||||
| OR | Host lambda function | ? | PREDICATE | `T` if and only if at least one of my `args` evaluates to something other than either `F` or `NIL`, else `F`.<br><br>In `beowulf.host` principally because I don't yet feel confident to define varargs functions in Lisp. |
|
||||
| PAIR | Lisp lambda function | ? | | see manual pages <a href='https://www.softwarepreservation.org/projects/LISP/book/LISP%201.5%20Programmers%20Manual.pdf#page=60'>60</a> |
|
||||
| PAIRLIS | Lisp lambda function, Host lambda function | ? | ? | This function gives the list of pairs of corresponding elements of the lists `x` and `y`, and APPENDs this to the list `a`. The resultant list of pairs, which is like a table with two columns, is called an association list. Essentially, it builds the environment on the stack, implementing shallow binding.<br><br>All args are assumed to be `beowulf.cons-cell/ConsCell` objects. See page <a href='https://www.softwarepreservation.org/projects/LISP/book/LISP%201.5%20Programmers%20Manual.pdf#page=12'>12</a> of the Lisp 1.5 Programmers Manual.<br><br>**NOTE THAT** this function is overridden by an implementation in Lisp, but is currently still present for bootstrapping. |
|
||||
| PLUS | Host lambda function | ? | | ? |
|
||||
| PRETTY | | ? | ? | ? |
|
||||
| PRINT | | ? | PSEUDO-FUNCTION | see manual pages <a href='#page65'>65</a>, <a href='#page84'>84</a> |
|
||||
| PROG | Host nlambda function | ? | | The accursed `PROG` feature. See page 71 of the manual. Lisp 1.5 introduced `PROG`, 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, `PROG` is a variadic pseudo function called as a `FEXPR` (or possibly an `FSUBR`, 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 `GO` statement. **GO:** A `GO` statement takes the form of `(GO target)`, where `target` should be one of the symbols which occur at top level among that particular invocation of `PROG`s arguments. A `GO` statement may occur at top level in a PROG, or in a clause of a `COND` statement in a `PROG`, but not in a function called from the `PROG` statement. When a `GO` 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 `A6` should be thrown. **RETURN:** A `RETURN` statement takes the form `(RETURN value)`, where `value` is any value. Following the evaluation of a `RETURN` statement, the `PROG` should immediately exit without executing any further expressions, returning the value. **SET and SETQ:** In addition to the above, if a `SET` or `SETQ` expression is encountered in any expression within the `PROG` body, it should affect not the global object list but instead only the local variables of the program. **COND:** In **strict** mode, when in normal execution, a `COND` statement none of whose clauses match should not return `NIL` but should throw an error with the code `A3`... *except* that inside a `PROG` body, it should not do so. *sigh*. **Flow of control:** Apart from the exceptions specified above, expressions in the program body are evaluated sequentially. If execution reaches the end of the program body, `NIL` is returned. Got all that? Good. |
|
||||
| PROP | Lisp lambda function | ? | FUNCTIONAL | see manual pages <a href='#page59'>59</a> |
|
||||
| QUOTE | Lisp lambda function | ? | | see manual pages <a href='#page10'>10</a>, <a href='#page22'>22</a>, <a href='#page71'>71</a> |
|
||||
| QUOTIENT | Host lambda function | ? | | I'm not certain from the documentation whether Lisp 1.5 `QUOTIENT` returned the integer part of the quotient, or a realnum representing the whole quotient. I am for now implementing the latter. |
|
||||
| PRINT | | ? | PSEUDO-FUNCTION | see manual pages <a href='https://www.softwarepreservation.org/projects/LISP/book/LISP%201.5%20Programmers%20Manual.pdf#page=65'>65</a>, <a href='https://www.softwarepreservation.org/projects/LISP/book/LISP%201.5%20Programmers%20Manual.pdf#page=84'>84</a> |
|
||||
| PROG | Host nlambda function | ? | | The accursed `PROG` feature. See page <a href='https://www.softwarepreservation.org/projects/LISP/book/LISP%201.5%20Programmers%20Manual.pdf#page=71'>71</a> of the manual.<br><br>Lisp 1.5 introduced `PROG`, 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, `PROG` is a variadic pseudo function called as a `FEXPR` (or possibly an `FSUBR`, 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 `GO` statement. <ul><li>**GO:** A `GO` statement takes the form of `(GO target)`, where `target` should be one of the symbols which occur at top level among that particular invocation of `PROG`s arguments. A `GO` statement may occur at top level in a PROG, or in a clause of a `COND` statement in a `PROG`, but not in a function called from the `PROG` statement. When a `GO` 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 `A6` should be thrown.</li><li>**RETURN:** A `RETURN` statement takes the form `(RETURN value)`, where `value` is any value. Following the evaluation of a `RETURN` statement, the `PROG` should immediately exit without executing any further expressions, returning the value.</li><li>**SET and SETQ:** In addition to the above, if a `SET` or `SETQ` expression is encountered in any expression within the `PROG` body, it should affect not the global object list but instead only the local variables of the program.</li><li>**COND:** In **strict** mode, when in normal execution, a `COND` statement none of whose clauses match should not return `NIL` but should throw an error with the code `A3`... *except* that inside a `PROG` body, it should not do so. *sigh*.</li></ul>**Flow of control:** Apart from the exceptions specified above, expressions in the program body are evaluated sequentially. If execution reaches the end of the program body, `NIL` is returned.<br><br>Got all that? Good. |
|
||||
| PROP | Lisp lambda function | ? | FUNCTIONAL | see manual pages <a href='https://www.softwarepreservation.org/projects/LISP/book/LISP%201.5%20Programmers%20Manual.pdf#page=59'>59</a> |
|
||||
| QUOTE | Lisp lambda function | ? | | see manual pages <a href='https://www.softwarepreservation.org/projects/LISP/book/LISP%201.5%20Programmers%20Manual.pdf#page=10'>10</a>, <a href='https://www.softwarepreservation.org/projects/LISP/book/LISP%201.5%20Programmers%20Manual.pdf#page=22'>22</a>, <a href='https://www.softwarepreservation.org/projects/LISP/book/LISP%201.5%20Programmers%20Manual.pdf#page=71'>71</a> |
|
||||
| QUOTIENT | Host lambda function | ? | | I'm not certain from the documentation whether Lisp 1.5 `QUOTIENT` returned the integer part of the quotient, or a realnum representing the whole quotient. I am for now implementing the latter. |
|
||||
| RANGE | Lisp lambda function | ? | ? | ? |
|
||||
| READ | Host lambda function | ? | PSEUDO-FUNCTION | 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. |
|
||||
| REMAINDER | Host lambda function | ? | | ? |
|
||||
| REPEAT | Lisp lambda function | ? | ? | ? |
|
||||
| RPLACA | Host lambda function | ? | PSEUDO-FUNCTION | Replace the CAR pointer of this `cell` with this `value`. Dangerous, should really not exist, but does in Lisp 1.5 (and was important for some performance hacks in early Lisps) |
|
||||
| RPLACD | Host lambda function | ? | PSEUDO-FUNCTION | Replace the CDR pointer of this `cell` with this `value`. Dangerous, should really not exist, but does in Lisp 1.5 (and was important for some performance hacks in early Lisps) |
|
||||
| SEARCH | Lisp lambda function | ? | FUNCTIONAL | see manual pages <a href='#page63'>63</a> |
|
||||
| SET | Host lambda function | ? | PSEUDO-FUNCTION | Implementation of SET in Clojure. Add to the `oblist` a binding of the value of `var` to the value of `val`. NOTE WELL: this is not SETQ! |
|
||||
| RPLACA | Host lambda function | ? | PSEUDO-FUNCTION | Replace the `CAR` pointer of this `cell` with this `value`. Dangerous, should really not exist, but does in Lisp 1.5 (and was important for some performance hacks in early Lisps) |
|
||||
| RPLACD | Host lambda function | ? | PSEUDO-FUNCTION | Replace the `CDR` pointer of this `cell` with this `value`. Dangerous, should really not exist, but does in Lisp 1.5 (and was important for some performance hacks in early Lisps) |
|
||||
| SEARCH | Lisp lambda function | ? | FUNCTIONAL | see manual pages <a href='https://www.softwarepreservation.org/projects/LISP/book/LISP%201.5%20Programmers%20Manual.pdf#page=63'>63</a> |
|
||||
| SET | Host lambda function | ? | PSEUDO-FUNCTION | Implementation of SET in Clojure. Add to the `oblist` a binding of the value of `var` to the value of `val`.<br><br>**NOTE WELL**: this is not SETQ! |
|
||||
| SUB1 | Lisp lambda function, Host lambda function | ? | | ? |
|
||||
| SUB2 | Lisp lambda function | ? | ? | ? |
|
||||
| SUBLIS | Lisp lambda function | ? | | see manual pages <a href='#page12'>12</a>, <a href='#page61'>61</a> |
|
||||
| SUBST | Lisp lambda function | ? | | see manual pages <a href='#page11'>11</a>, <a href='#page61'>61</a> |
|
||||
| SYSIN | Host lambda function | ? | ? | Read the contents of the file at this `filename` 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. **NOTE THAT** if the provided `filename` does not end with `.lsp` (which, if you're writing it from the Lisp REPL, it won't), the extension `.lsp` will be appended. **NOTE THAT** this is an extension function, not available in strct mode. |
|
||||
| SYSOUT | Host lambda function | ? | ? | Dump the current content of the object list to file. If no `filepath` is specified, a file name will be constructed of the symbol `Sysout` and the current date. File paths will be considered relative to the filepath set when starting Lisp. **NOTE THAT** this is an extension function, not available in strct mode. |
|
||||
| TERPRI | | ? | PSEUDO-FUNCTION | see manual pages <a href='#page65'>65</a>, <a href='#page84'>84</a> |
|
||||
| SUBLIS | Lisp lambda function | ? | | see manual pages <a href='https://www.softwarepreservation.org/projects/LISP/book/LISP%201.5%20Programmers%20Manual.pdf#page=12'>12</a>, <a href='https://www.softwarepreservation.org/projects/LISP/book/LISP%201.5%20Programmers%20Manual.pdf#page=61'>61</a> |
|
||||
| SUBST | Lisp lambda function | ? | | see manual pages <a href='https://www.softwarepreservation.org/projects/LISP/book/LISP%201.5%20Programmers%20Manual.pdf#page=11'>11</a>, <a href='https://www.softwarepreservation.org/projects/LISP/book/LISP%201.5%20Programmers%20Manual.pdf#page=61'>61</a> |
|
||||
| SYSIN | Host lambda function | ? | ? | Read the contents of the file at this `filename` 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.<br><br>**NOTE THAT** if the provided `filename` does not end with `.lsp` (which, if you're writing it from the Lisp REPL, it won't), the extension `.lsp` will be appended.<br><br>**NOTE THAT** this is an extension function, not available in strct mode. |
|
||||
| SYSOUT | Host lambda function | ? | ? | Dump the current content of the object list to file. If no `filepath` is specified, a file name will be constructed of the symbol `Sysout` and the current date. File paths will be considered relative to the filepath set when starting Lisp.<br><br>**NOTE THAT** this is an extension function, not available in strict mode. |
|
||||
| TERPRI | | ? | PSEUDO-FUNCTION | see manual pages <a href='https://www.softwarepreservation.org/projects/LISP/book/LISP%201.5%20Programmers%20Manual.pdf#page=65'>65</a>, <a href='https://www.softwarepreservation.org/projects/LISP/book/LISP%201.5%20Programmers%20Manual.pdf#page=84'>84</a> |
|
||||
| TIMES | Host lambda function | ? | | ? |
|
||||
| TRACE | Host lambda function | ? | PSEUDO-FUNCTION | Add this `s` to the set of symbols currently being traced. If `s` is not a symbol or sequence of symbols, does nothing. |
|
||||
| UNION | Lisp lambda function | ? | ? | ? |
|
||||
| UNTRACE | Host lambda function | ? | PSEUDO-FUNCTION | Remove this `s` from the set of symbols currently being traced. If `s` is not a symbol or sequence of symbols, does nothing. |
|
||||
| ZEROP | Lisp lambda function | ? | PREDICATE | see manual pages <a href='#page26'>26</a>, <a href='#page64'>64</a> |
|
||||
| UNTRACE | Host lambda function | ? | PSEUDO-FUNCTION | Remove this `s` from the set of symbols currently being traced. If `s` is not a symbol or sequence of symbols, does nothing. |
|
||||
| ZEROP | Lisp lambda function | ? | PREDICATE | see manual pages <a href='https://www.softwarepreservation.org/projects/LISP/book/LISP%201.5%20Programmers%20Manual.pdf#page=26'>26</a>, <a href='https://www.softwarepreservation.org/projects/LISP/book/LISP%201.5%20Programmers%20Manual.pdf#page=64'>64</a> |
|
||||
|
||||
Functions described as 'Lisp function' above are defined in the default
|
||||
sysout file, `resources/lisp1.5.lsp`, which will be loaded by default unless
|
||||
|
|
@ -219,8 +216,7 @@ over the Clojure implementations.
|
|||
|
||||
### Architectural plan
|
||||
|
||||
Not everything documented in this section is yet built. It indicates the
|
||||
direction of travel and intended destination, not the current state.
|
||||
Not everything documented in this section is yet built. It indicates the direction of travel and intended destination, not the current state.
|
||||
|
||||
#### resources/lisp1.5.lsp
|
||||
|
||||
|
|
@ -338,7 +334,7 @@ even has a working compiler!
|
|||
|
||||
### History resources
|
||||
|
||||
I'm compiling a [list of links to historical documents on Lisp 1.5](https://simon-brooke.github.io/beowulf/docs/codox/further_reading.html).
|
||||
I'm compiling a [list of links to historical documents on Lisp 1.5](https://simon-brooke.github.io/beowulf/docs/further_reading.html).
|
||||
|
||||
## License
|
||||
|
||||
|
|
|
|||
|
|
@ -961,15 +961,19 @@ But if eval is given (QUOTE X), X should not be evaluated. QUOTE is a special fo
|
|||
that prevents its argument from being evaluated.
|
||||
A special form differs from a function in two ways. Its arguments are not evaluated
|
||||
before the special form sees them. COND, for example, has a very special way of
|
||||
```
|
||||
|
||||
evaluating its arguments by using evcon. The second way which special forms differ
|
||||
from functions is that they may have an indefinite number of arguments. Special forms
|
||||
have indicators on their property lists called FEXPR and FSUBR for LISP-defined forms
|
||||
from functions is that they may have an indefinite number of arguments. Special forrrls
|
||||
have indicators on their property lists called FEXPR and FSUBR for LISP -defined forms
|
||||
and machine language coded forms, respectively.
|
||||
|
||||
### 2.6 Programming for the Interpreter
|
||||
```
|
||||
2.6 Programming for the Interpreter
|
||||
```
|
||||
|
||||
The purpose of this section is to help the programmer avoid certain common errors.
|
||||
Example 1: CAR
|
||||
Example 1
|
||||
fn: CAR
|
||||
args: ((A B))
|
||||
The value is A. Note that the interpreter expects a list of arguments. The one argu-
|
||||
|
|
@ -977,18 +981,20 @@ ment for car is (A B). The extra pair of parentheses is necessary.
|
|||
One could write (LAMBDA (X) (CAR X)) instead of just CAR. This is correct but
|
||||
unnecessary.
|
||||
|
||||
Example 2: CONS
|
||||
```
|
||||
Example 2
|
||||
fn: CONS
|
||||
args: (A (B . C))
|
||||
The value is cons[a; cons[b; c]] = (A . (B . C)).
|
||||
The print program will write this as (A B . C).
|
||||
args: (A (B. C))
|
||||
The value is cons[^;(^. c)] = (A. (B. C)).
|
||||
The print program will write this as (A B. C).
|
||||
```
|
||||
|
||||
Example (^3) -
|
||||
fn: CONS
|
||||
args: ((CAR (QUOTE (A . B))) (CDR (QUOTE (C . D))))
|
||||
The value of this computation will be ((CAR (QUOTE (A . B))) . (CDR (QUOTE (C . D)))).
|
||||
This is not what the programmer expected. He expected (CAR (QUOTE (A . B))) to
|
||||
evaluate to A, and expected (A . D) as the value of cons.
|
||||
args: ((CAR (QUOTE (A. B))) (CDR (QUOTE (C. D))))
|
||||
The value of this computation will be ((CAR (QUOTE (A. B))). (CDR (QUOTE (C. D)))).
|
||||
This is not what the programmer expected. He expected (CAR (QUOTE (A. B))) to
|
||||
evaluate to A, and expected (A. D) as the value of cons.
|
||||
|
||||
* The interpreter expects a ---- list of arguments. ------- It does not expect a list of expressions
|
||||
-- that will evaluate to the arguments. Tworcorrect ways of writing this function are listed
|
||||
|
|
@ -1715,7 +1721,6 @@ 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)),
|
||||
|
||||
|
|
@ -2704,9 +2709,7 @@ 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[FF; (EXPR (LAMBDA (X) (COND ((ATOM X) X) (T (FF (CAR x))))))]
|
||||
```
|
||||
attrib[~~; (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.
|
||||
|
||||
|
|
|
|||
|
|
@ -331,13 +331,13 @@
|
|||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
109 ;; else
|
||||
</span><br/>
|
||||
<span class="covered" title="5 out of 5 forms covered">
|
||||
<span class="covered" title="3 out of 3 forms covered">
|
||||
110 (beowulf.bootstrap/EVAL expr
|
||||
</span><br/>
|
||||
<span class="partial" title="7 out of 11 forms covered">
|
||||
<span class="covered" title="6 out of 6 forms covered">
|
||||
111 (merge-vars vars env)
|
||||
</span><br/>
|
||||
<span class="covered" title="1 out of 1 forms covered">
|
||||
<span class="partial" title="4 out of 8 forms covered">
|
||||
112 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
|
||||
</span><br/>
|
||||
<span class="covered" title="2 out of 2 forms covered">
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
117 Lisp 1.5 introduced `PROG`, and most Lisps have been stuck with it ever
|
||||
</span><br/>
|
||||
<span class="partial" title="3 out of 7 forms covered">
|
||||
<span class="covered" title="2 out of 2 forms covered">
|
||||
118 since. It introduces imperative programming into what should be a pure
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
<span class="partial" title="3 out of 7 forms covered">
|
||||
119 functional language, and consequently it's going to be a pig to 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 (let [lisp-fn (value function-symbol '(EXPR FEXPR))
|
||||
</span><br/>
|
||||
<span class="partial" title="7 out of 8 forms covered">
|
||||
<span class="partial" title="6 out of 8 forms covered">
|
||||
252 args' (cond (= NIL args) args
|
||||
</span><br/>
|
||||
<span class="partial" title="3 out of 4 forms covered">
|
||||
|
|
|
|||
|
|
@ -259,7 +259,7 @@
|
|||
<span class="covered" title="1 out of 1 forms covered">
|
||||
085 (if
|
||||
</span><br/>
|
||||
<span class="partial" title="11 out of 13 forms covered">
|
||||
<span class="partial" title="10 out of 13 forms covered">
|
||||
086 (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 clojure.lang.Counted
|
||||
</span><br/>
|
||||
<span class="covered" title="3 out of 3 forms covered">
|
||||
<span class="not-covered" title="0 out of 3 forms covered">
|
||||
148 (count [this] (loop [cell this
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
149 result 1]
|
||||
</span><br/>
|
||||
<span class="covered" title="1 out of 1 forms covered">
|
||||
<span class="not-covered" title="0 out of 1 forms covered">
|
||||
150 (if
|
||||
</span><br/>
|
||||
<span class="covered" title="11 out of 11 forms covered">
|
||||
<span class="not-covered" title="0 out of 11 forms covered">
|
||||
151 (and (coll? (.getCdr cell)) (not= NIL (.getCdr cell)))
|
||||
</span><br/>
|
||||
<span class="covered" title="1 out of 1 forms covered">
|
||||
<span class="not-covered" title="0 out of 1 forms covered">
|
||||
152 (recur (.getCdr cell) (inc result))
|
||||
</span><br/>
|
||||
<span class="covered" title="1 out of 1 forms covered">
|
||||
<span class="not-covered" title="0 out of 1 forms covered">
|
||||
153 result)))
|
||||
</span><br/>
|
||||
<span class="blank" title="0 out of 0 forms covered">
|
||||
|
|
|
|||
|
|
@ -154,10 +154,10 @@
|
|||
<span class="covered" title="1 out of 1 forms covered">
|
||||
050 :default default-sysout
|
||||
</span><br/>
|
||||
<span class="partial" title="7 out of 8 forms covered">
|
||||
<span class="partial" title="3 out of 8 forms covered">
|
||||
051 :validate [#(and
|
||||
</span><br/>
|
||||
<span class="covered" title="4 out of 4 forms covered">
|
||||
<span class="not-covered" title="0 out of 4 forms covered">
|
||||
052 (.exists (io/file %))
|
||||
</span><br/>
|
||||
<span class="not-covered" title="0 out of 3 forms covered">
|
||||
|
|
@ -170,40 +170,40 @@
|
|||
055 ["-s" "--strict" "Strictly interpret the Lisp 1.5 language, without extensions."]
|
||||
</span><br/>
|
||||
<span class="covered" title="4 out of 4 forms covered">
|
||||
056 ["-t" "--time" "Time evaluations."]
|
||||
</span><br/>
|
||||
<span class="covered" title="4 out of 4 forms covered">
|
||||
057 ["-x" "--testing" "Disable the jline reader - useful when piping input."]])
|
||||
056 ["-t" "--time" "Time evaluations."]])
|
||||
</span><br/>
|
||||
<span class="blank" title="0 out of 0 forms covered">
|
||||
058
|
||||
057
|
||||
</span><br/>
|
||||
<span class="covered" title="1 out of 1 forms covered">
|
||||
059 (defn- re
|
||||
058 (defn- re
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
060 "Like REPL, but it isn't a loop and doesn't print."
|
||||
059 "Like REPL, but it isn't a loop and doesn't print."
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
061 [input]
|
||||
060 [input]
|
||||
</span><br/>
|
||||
<span class="covered" title="7 out of 7 forms covered">
|
||||
062 (EVAL (READ input) NIL 0))
|
||||
061 (EVAL (READ input) NIL 0))
|
||||
</span><br/>
|
||||
<span class="blank" title="0 out of 0 forms covered">
|
||||
063
|
||||
062
|
||||
</span><br/>
|
||||
<span class="covered" title="1 out of 1 forms covered">
|
||||
064 (defn repl
|
||||
063 (defn repl
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
065 "Read/eval/print loop."
|
||||
064 "Read/eval/print loop."
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
066 [prompt]
|
||||
065 [prompt]
|
||||
</span><br/>
|
||||
<span class="covered" title="1 out of 1 forms covered">
|
||||
067 (loop []
|
||||
066 (loop []
|
||||
</span><br/>
|
||||
<span class="covered" title="3 out of 3 forms covered">
|
||||
067 (print prompt)
|
||||
</span><br/>
|
||||
<span class="covered" title="2 out of 2 forms covered">
|
||||
068 (flush)
|
||||
|
|
@ -211,8 +211,8 @@
|
|||
<span class="covered" title="1 out of 1 forms covered">
|
||||
069 (try
|
||||
</span><br/>
|
||||
<span class="covered" title="10 out of 10 forms covered">
|
||||
070 (if-let [input (trim (read-from-console prompt))]
|
||||
<span class="covered" title="9 out of 9 forms covered">
|
||||
070 (if-let [input (trim (read-from-console))]
|
||||
</span><br/>
|
||||
<span class="covered" title="4 out of 4 forms covered">
|
||||
071 (if (= input stop-word)
|
||||
|
|
@ -259,7 +259,7 @@
|
|||
<span class="covered" title="1 out of 1 forms covered">
|
||||
085 data
|
||||
</span><br/>
|
||||
<span class="covered" title="6 out of 6 forms covered">
|
||||
<span class="partial" title="5 out of 6 forms covered">
|
||||
086 (case (:cause 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 (str "Síðe " (System/getProperty "beowulf.version") "\n"))
|
||||
</span><br/>
|
||||
<span class="covered" title="2 out of 2 forms covered">
|
||||
<span class="partial" title="1 out of 2 forms covered">
|
||||
105 (when
|
||||
</span><br/>
|
||||
<span class="covered" title="5 out of 5 forms covered">
|
||||
106 (:help (:options args))
|
||||
</span><br/>
|
||||
<span class="covered" title="3 out of 3 forms covered">
|
||||
<span class="not-covered" title="0 out of 3 forms covered">
|
||||
107 (:summary 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 (try
|
||||
</span><br/>
|
||||
<span class="covered" title="7 out of 7 forms covered">
|
||||
119 (repl (:prompt (:options args)))
|
||||
<span class="covered" title="10 out of 10 forms covered">
|
||||
119 (repl (str (:prompt (:options args)) " "))
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
120 (catch
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -334,13 +334,13 @@
|
|||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
110 reference."
|
||||
</span><br/>
|
||||
<span class="partial" title="1 out of 3 forms covered">
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
111 ([entry]
|
||||
</span><br/>
|
||||
<span class="partial" title="9 out of 12 forms covered">
|
||||
112 (or (resolve-subr entry 'SUBR)
|
||||
</span><br/>
|
||||
<span class="not-covered" title="0 out of 3 forms covered">
|
||||
<span class="partial" title="1 out of 6 forms covered">
|
||||
113 (resolve-subr entry 'FSUBR)))
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
|
|
|
|||
|
|
@ -133,8 +133,8 @@
|
|||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
043 "Command line options from invocation."
|
||||
</span><br/>
|
||||
<span class="covered" title="3 out of 3 forms covered">
|
||||
044 {:testing true})
|
||||
<span class="covered" title="1 out of 1 forms covered">
|
||||
044 {})
|
||||
</span><br/>
|
||||
<span class="blank" title="0 out of 0 forms covered">
|
||||
045
|
||||
|
|
|
|||
|
|
@ -50,319 +50,283 @@
|
|||
015 switch."
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
016 (:require [beowulf.oblist :refer [*options*]]
|
||||
016 (:require ;; [beowulf.reader.char-reader :refer [read-chars]]
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
017 [beowulf.reader.char-reader :refer [read-chars]]
|
||||
017 [beowulf.reader.generate :refer [generate]]
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
018 [beowulf.reader.generate :refer [generate]]
|
||||
018 [beowulf.reader.parser :refer [parse]]
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
019 [beowulf.reader.parser :refer [parse]]
|
||||
019 [beowulf.reader.simplify :refer [simplify]]
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
020 [beowulf.reader.simplify :refer [simplify]]
|
||||
020 [clojure.string :refer [join split starts-with? trim]])
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
021 [clojure.string :refer [join split starts-with? trim]])
|
||||
021 (:import [java.io InputStream]
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
022 (:import [instaparse.gll Failure]
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
023 [java.io InputStream]))
|
||||
022 [instaparse.gll Failure]))
|
||||
</span><br/>
|
||||
<span class="blank" title="0 out of 0 forms covered">
|
||||
024
|
||||
023
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
025 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
024 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
026 ;;;
|
||||
025 ;;;
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
027 ;;; This file provides the reader required for boostrapping. It's not a bad
|
||||
026 ;;; This file provides the reader required for boostrapping. It's not a bad
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
028 ;;; reader - it provides feedback on errors found in the input - but it isn't
|
||||
027 ;;; reader - it provides feedback on errors found in the input - but it isn't
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
029 ;;; the real Lisp reader.
|
||||
028 ;;; the real Lisp reader.
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
030 ;;;
|
||||
029 ;;;
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
031 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
030 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
032 ;;;
|
||||
031 ;;;
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
033 ;;; Copyright (C) 2022-2023 Simon Brooke
|
||||
032 ;;; Copyright (C) 2022-2023 Simon Brooke
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
034 ;;;
|
||||
033 ;;;
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
035 ;;; This program is free software; you can redistribute it and/or
|
||||
034 ;;; This program is free software; you can redistribute it and/or
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
036 ;;; modify it under the terms of the GNU General Public License
|
||||
035 ;;; modify it under the terms of the GNU General Public License
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
037 ;;; as published by the Free Software Foundation; either version 2
|
||||
036 ;;; as published by the Free Software Foundation; either version 2
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
038 ;;; of the License, or (at your option) any later version.
|
||||
037 ;;; of the License, or (at your option) any later version.
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
039 ;;;
|
||||
038 ;;;
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
040 ;;; This program is distributed in the hope that it will be useful,
|
||||
039 ;;; This program is distributed in the hope that it will be useful,
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
041 ;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
040 ;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
042 ;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
041 ;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
043 ;;; GNU General Public License for more details.
|
||||
042 ;;; GNU General Public License for more details.
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
044 ;;;
|
||||
043 ;;;
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
045 ;;; You should have received a copy of the GNU General Public License
|
||||
044 ;;; You should have received a copy of the GNU General Public License
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
046 ;;; along with this program; if not, write to the Free Software
|
||||
045 ;;; along with this program; if not, write to the Free Software
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
047 ;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
046 ;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
048 ;;;
|
||||
047 ;;;
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
049 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
048 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
</span><br/>
|
||||
<span class="blank" title="0 out of 0 forms covered">
|
||||
050
|
||||
049
|
||||
</span><br/>
|
||||
<span class="covered" title="1 out of 1 forms covered">
|
||||
051 (defn strip-line-comments
|
||||
050 (defn strip-line-comments
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
052 "Strip blank lines and comment lines from this string `s`, expected to
|
||||
051 "Strip blank lines and comment lines from this string `s`, expected to
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
053 be Lisp source."
|
||||
052 be Lisp source."
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
054 [^String s]
|
||||
053 [^String s]
|
||||
</span><br/>
|
||||
<span class="covered" title="3 out of 3 forms covered">
|
||||
055 (join "\n"
|
||||
054 (join "\n"
|
||||
</span><br/>
|
||||
<span class="covered" title="3 out of 3 forms covered">
|
||||
056 (remove
|
||||
055 (remove
|
||||
</span><br/>
|
||||
<span class="covered" title="9 out of 9 forms covered">
|
||||
057 #(or (empty? %)
|
||||
056 #(or (empty? %)
|
||||
</span><br/>
|
||||
<span class="covered" title="4 out of 4 forms covered">
|
||||
058 (starts-with? (trim %) ";;"))
|
||||
057 (starts-with? (trim %) ";;"))
|
||||
</span><br/>
|
||||
<span class="covered" title="4 out of 4 forms covered">
|
||||
059 (split s #"\n"))))
|
||||
058 (split s #"\n"))))
|
||||
</span><br/>
|
||||
<span class="blank" title="0 out of 0 forms covered">
|
||||
060
|
||||
059
|
||||
</span><br/>
|
||||
<span class="covered" title="1 out of 1 forms covered">
|
||||
061 (defn number-lines
|
||||
060 (defn number-lines
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
062 ([^String s]
|
||||
061 ([^String s]
|
||||
</span><br/>
|
||||
<span class="not-covered" title="0 out of 4 forms covered">
|
||||
063 (number-lines s nil))
|
||||
062 (number-lines s nil))
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
064 ([^String s ^Failure e]
|
||||
063 ([^String s ^Failure e]
|
||||
</span><br/>
|
||||
<span class="not-covered" title="0 out of 4 forms covered">
|
||||
065 (let [l (-> e :line)
|
||||
064 (let [l (-> e :line)
|
||||
</span><br/>
|
||||
<span class="not-covered" title="0 out of 3 forms covered">
|
||||
066 c (-> e :column)]
|
||||
065 c (-> e :column)]
|
||||
</span><br/>
|
||||
<span class="not-covered" title="0 out of 3 forms covered">
|
||||
067 (join "\n"
|
||||
066 (join "\n"
|
||||
</span><br/>
|
||||
<span class="not-covered" title="0 out of 11 forms covered">
|
||||
068 (map #(str (format "%5d %s" (inc %1) %2)
|
||||
067 (map #(str (format "%5d %s" (inc %1) %2)
|
||||
</span><br/>
|
||||
<span class="not-covered" title="0 out of 6 forms covered">
|
||||
069 (when (= l (inc %1))
|
||||
068 (when (= l (inc %1))
|
||||
</span><br/>
|
||||
<span class="not-covered" title="0 out of 11 forms covered">
|
||||
070 (str "\n" (apply str (repeat c " ")) "^")))
|
||||
069 (str "\n" (apply str (repeat c " ")) "^")))
|
||||
</span><br/>
|
||||
<span class="not-covered" title="0 out of 2 forms covered">
|
||||
071 (range)
|
||||
070 (range)
|
||||
</span><br/>
|
||||
<span class="not-covered" title="0 out of 4 forms covered">
|
||||
072 (split s #"\n"))))))
|
||||
071 (split s #"\n"))))))
|
||||
</span><br/>
|
||||
<span class="blank" title="0 out of 0 forms covered">
|
||||
073
|
||||
072
|
||||
</span><br/>
|
||||
<span class="covered" title="1 out of 1 forms covered">
|
||||
074 (defn gsp
|
||||
073 (defn gsp
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
075 "Shortcut macro - the internals of read; or, if you like, read-string.
|
||||
074 "Shortcut macro - the internals of read; or, if you like, read-string.
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
076 Argument `s` should be a string representation of a valid Lisp
|
||||
075 Argument `s` should be a string representation of a valid Lisp
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
077 expression."
|
||||
076 expression."
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
078 [s]
|
||||
077 [s]
|
||||
</span><br/>
|
||||
<span class="covered" title="4 out of 4 forms covered">
|
||||
079 (let [source (strip-line-comments s)
|
||||
078 (let [source (strip-line-comments s)
|
||||
</span><br/>
|
||||
<span class="covered" title="3 out of 3 forms covered">
|
||||
080 parse-tree (parse source)]
|
||||
079 parse-tree (parse source)]
|
||||
</span><br/>
|
||||
<span class="covered" title="5 out of 5 forms covered">
|
||||
081 (if (instance? Failure parse-tree)
|
||||
080 (if (instance? Failure parse-tree)
|
||||
</span><br/>
|
||||
<span class="not-covered" title="0 out of 8 forms covered">
|
||||
082 (doall (println (number-lines source parse-tree))
|
||||
081 (doall (println (number-lines source parse-tree))
|
||||
</span><br/>
|
||||
<span class="not-covered" title="0 out of 9 forms covered">
|
||||
083 (throw (ex-info "Ne can forstande " (assoc parse-tree :source source))))
|
||||
082 (throw (ex-info "Ne can forstande " (assoc parse-tree :source source))))
|
||||
</span><br/>
|
||||
<span class="covered" title="5 out of 5 forms covered">
|
||||
084 (generate (simplify parse-tree)))))
|
||||
083 (generate (simplify parse-tree)))))
|
||||
</span><br/>
|
||||
<span class="blank" title="0 out of 0 forms covered">
|
||||
085
|
||||
084
|
||||
</span><br/>
|
||||
<span class="covered" title="1 out of 1 forms covered">
|
||||
086 (defn- dummy-read-chars [prompt]
|
||||
085 (defn read-from-console
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
086 "Attempt to read a complete lisp expression from the console. NOTE that this
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
087 will only really work for S-Expressions, not M-Expressions."
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
088 []
|
||||
</span><br/>
|
||||
<span class="covered" title="3 out of 3 forms covered">
|
||||
087 (loop [r "" p prompt]
|
||||
089 (loop [r (read-line)]
|
||||
</span><br/>
|
||||
<span class="partial" title="12 out of 13 forms covered">
|
||||
088 (if (and (seq r)
|
||||
</span><br/>
|
||||
<span class="covered" title="6 out of 6 forms covered">
|
||||
089 (= (count (re-seq #"\(" r))
|
||||
<span class="partial" title="11 out of 12 forms covered">
|
||||
090 (if (and (= (count (re-seq #"\(" r))
|
||||
</span><br/>
|
||||
<span class="covered" title="5 out of 5 forms covered">
|
||||
090 (count (re-seq #"\)" r)))
|
||||
091 (count (re-seq #"\)" r)))
|
||||
</span><br/>
|
||||
<span class="covered" title="5 out of 5 forms covered">
|
||||
091 (= (count (re-seq #"\[" r))
|
||||
092 (= (count (re-seq #"\[" r))
|
||||
</span><br/>
|
||||
<span class="covered" title="5 out of 5 forms covered">
|
||||
092 (count (re-seq #"\]" r))))
|
||||
093 (count (re-seq #"\]" r))))
|
||||
</span><br/>
|
||||
<span class="covered" title="1 out of 1 forms covered">
|
||||
093 r
|
||||
094 r
|
||||
</span><br/>
|
||||
<span class="covered" title="1 out of 1 forms covered">
|
||||
094 (do
|
||||
</span><br/>
|
||||
<span class="covered" title="6 out of 6 forms covered">
|
||||
095 (print (str p " "))
|
||||
</span><br/>
|
||||
<span class="covered" title="2 out of 2 forms covered">
|
||||
096 (flush)
|
||||
</span><br/>
|
||||
<span class="covered" title="1 out of 1 forms covered">
|
||||
097 (recur (str r "\n" (read-line)) "::")))))
|
||||
<span class="not-covered" title="0 out of 1 forms covered">
|
||||
095 (recur (str r "\n" (read-line))))))
|
||||
</span><br/>
|
||||
<span class="blank" title="0 out of 0 forms covered">
|
||||
098
|
||||
096
|
||||
</span><br/>
|
||||
<span class="covered" title="1 out of 1 forms covered">
|
||||
099 (defn read-from-console
|
||||
097 (defn READ
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
100 "Attempt to read a complete lisp expression from the console.
|
||||
098 "An implementation of a Lisp reader sufficient for bootstrapping; not necessarily
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
101
|
||||
099 the final Lisp reader. `input` should be either a string representation of a LISP
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
102 There's a major problem here that the read-chars reader messes up testing.
|
||||
100 expression, or else an input stream. A single form will be read."
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
103 We need to be able to disable it while testing!"
|
||||
101 ([]
|
||||
</span><br/>
|
||||
<span class="not-covered" title="0 out of 4 forms covered">
|
||||
102 (gsp (read-from-console)))
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
104 [prompt]
|
||||
</span><br/>
|
||||
<span class="covered" title="4 out of 4 forms covered">
|
||||
105 (if (:testing *options*)
|
||||
</span><br/>
|
||||
<span class="covered" title="3 out of 3 forms covered">
|
||||
106 (dummy-read-chars prompt)
|
||||
</span><br/>
|
||||
<span class="not-covered" title="0 out of 3 forms covered">
|
||||
107 (read-chars prompt)))
|
||||
</span><br/>
|
||||
<span class="blank" title="0 out of 0 forms covered">
|
||||
108
|
||||
</span><br/>
|
||||
<span class="covered" title="1 out of 1 forms covered">
|
||||
109 (defn READ
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
110 "An implementation of a Lisp reader sufficient for bootstrapping; not necessarily
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
111 the final Lisp reader. `input` should be either a string representation of a LISP
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
112 expression, or else an input stream. A single form will be read."
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
113 ([]
|
||||
</span><br/>
|
||||
<span class="not-covered" title="0 out of 7 forms covered">
|
||||
114 (gsp (read-from-console (:prompt *options*))))
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
115 ([input]
|
||||
103 ([input]
|
||||
</span><br/>
|
||||
<span class="partial" title="2 out of 4 forms covered">
|
||||
116 (cond
|
||||
104 (cond
|
||||
</span><br/>
|
||||
<span class="partial" title="3 out of 5 forms covered">
|
||||
117 (empty? input) (READ)
|
||||
105 (empty? input) (READ)
|
||||
</span><br/>
|
||||
<span class="covered" title="6 out of 6 forms covered">
|
||||
118 (string? input) (gsp input)
|
||||
106 (string? input) (gsp input)
|
||||
</span><br/>
|
||||
<span class="not-covered" title="0 out of 9 forms covered">
|
||||
119 (instance? InputStream input) (READ (slurp input))
|
||||
107 (instance? InputStream input) (READ (slurp input))
|
||||
</span><br/>
|
||||
<span class="not-covered" title="0 out of 5 forms covered">
|
||||
120 :else (throw (ex-info "READ: `input` should be a string or an input stream" {})))))
|
||||
108 :else (throw (ex-info "READ: `input` should be a string or an input stream" {})))))
|
||||
</span><br/>
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -71,259 +71,163 @@
|
|||
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 (:require [beowulf.oblist :refer [*options* oblist]])
|
||||
023 ;; (:import [org.jline.reader LineReader LineReaderBuilder]
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
024 (:import [org.jline.reader.impl.completer StringsCompleter]
|
||||
024 ;; [org.jline.terminal TerminalBuilder])
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
025 [org.jline.reader.impl DefaultParser DefaultParser$Bracket]
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
026 [org.jline.reader LineReaderBuilder]
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
027 [org.jline.terminal TerminalBuilder]
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
028 [org.jline.widget AutopairWidgets AutosuggestionWidgets]))
|
||||
025 )
|
||||
</span><br/>
|
||||
<span class="blank" title="0 out of 0 forms covered">
|
||||
029
|
||||
026
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
030 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
027 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
031 ;;;
|
||||
028 ;;;
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
032 ;;; Copyright (C) 2022-2023 Simon Brooke
|
||||
029 ;;; Copyright (C) 2022-2023 Simon Brooke
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
033 ;;;
|
||||
030 ;;;
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
034 ;;; This program is free software; you can redistribute it and/or
|
||||
031 ;;; This program is free software; you can redistribute it and/or
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
035 ;;; modify it under the terms of the GNU General Public License
|
||||
032 ;;; modify it under the terms of the GNU General Public License
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
036 ;;; as published by the Free Software Foundation; either version 2
|
||||
033 ;;; as published by the Free Software Foundation; either version 2
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
037 ;;; of the License, or (at your option) any later version.
|
||||
034 ;;; of the License, or (at your option) any later version.
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
038 ;;;
|
||||
035 ;;;
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
039 ;;; This program is distributed in the hope that it will be useful,
|
||||
036 ;;; This program is distributed in the hope that it will be useful,
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
040 ;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
037 ;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
041 ;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
038 ;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
042 ;;; GNU General Public License for more details.
|
||||
039 ;;; GNU General Public License for more details.
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
043 ;;;
|
||||
040 ;;;
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
044 ;;; You should have received a copy of the GNU General Public License
|
||||
041 ;;; You should have received a copy of the GNU General Public License
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
045 ;;; along with this program; if not, write to the Free Software
|
||||
042 ;;; along with this program; if not, write to the Free Software
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
046 ;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
043 ;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
047 ;;;
|
||||
044 ;;;
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
048 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
045 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
</span><br/>
|
||||
<span class="blank" title="0 out of 0 forms covered">
|
||||
049
|
||||
046
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
050 ;; It looks from the example given [here](https://github.com/jline/jline3/blob/master/demo/src/main/java/org/jline/demo/Repl.java)
|
||||
047 ;; It looks from the example given [here](https://github.com/jline/jline3/blob/master/demo/src/main/java/org/jline/demo/Repl.java)
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
051 ;; as though JLine could be used to build a perfect line-reader for Beowulf; but it also
|
||||
048 ;; as though JLine could be used to build a perfect line-reader for Beowulf; but it also
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
052 ;; looks as though you'd need a DPhil in JLine to write it, and I don't have
|
||||
049 ;; looks as though you'd need a DPhil in JLine to write it, and I don't have
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
053 ;; the time.
|
||||
050 ;; the time.
|
||||
</span><br/>
|
||||
<span class="blank" title="0 out of 0 forms covered">
|
||||
054
|
||||
</span><br/>
|
||||
<span class="covered" title="1 out of 1 forms covered">
|
||||
055 (defn build-completer
|
||||
051
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
056 "Build a completer which takes tokens from the oblist.
|
||||
052 ;; (def get-reader
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
057
|
||||
053 ;; "Return a reader, first constructing it if necessary.
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
058 This is sort-of working, in as much as hitting <TAB> on a blank line will
|
||||
054
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
059 show a table of values from the oblist, but hitting <TAB> after you've
|
||||
055 ;; **NOTE THAT** this is not settled API. The existence and call signature of
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
060 started input does not show potential completions for tokens you've started."
|
||||
056 ;; this function is not guaranteed in future versions."
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
061 []
|
||||
057 ;; (memoize (fn []
|
||||
</span><br/>
|
||||
<span class="not-covered" title="0 out of 12 forms covered">
|
||||
062 (StringsCompleter. (map #(str (first %)) @oblist)))
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
058 ;; (let [term (.build (.system (TerminalBuilder/builder) true))]
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
059 ;; (.build (.terminal (LineReaderBuilder/builder) term))))))
|
||||
</span><br/>
|
||||
<span class="blank" title="0 out of 0 forms covered">
|
||||
063
|
||||
060
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
064 ;; This breaks; it is not correctly resolving the Enum, although I can't work out
|
||||
061 ;; (defn read-chars
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
065 ;; why not.
|
||||
062 ;; "A drop-in replacement for `clojure.core/read-line`, except that line editing
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
066 ;; (defn build-parser
|
||||
063 ;; and history should be enabled.
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
067 ;; []
|
||||
064
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
068 ;; (println "Building parser")
|
||||
065 ;; **NOTE THAT** this does not work yet, but it is in the API because I hope
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
069 ;; (let [parser (DefaultParser.)]
|
||||
066 ;; that it will work later!"
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
070 ;; (doall
|
||||
067 ;; []
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
071 ;; (.setEofOnUnclosedBracket
|
||||
068 ;; (let [eddie (get-reader)]
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
072 ;; parser DefaultParser$Bracket/ROUND))))
|
||||
</span><br/>
|
||||
<span class="blank" title="0 out of 0 forms covered">
|
||||
073
|
||||
</span><br/>
|
||||
<span class="covered" title="1 out of 1 forms covered">
|
||||
074 (def get-reader
|
||||
069 ;; (loop [s (.readLine eddie)]
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
075 "Return a reader, first constructing it if necessary.
|
||||
070 ;; (if (and (= (count (re-seq #"\(" s))
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
076
|
||||
071 ;; (count (re-seq #"\)" s)))
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
077 **NOTE THAT** this is not settled API. The existence and call signature of
|
||||
072 ;; (= (count (re-seq #"\[]" s))
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
078 this function is not guaranteed in future versions."
|
||||
</span><br/>
|
||||
<span class="covered" title="3 out of 3 forms covered">
|
||||
079 (memoize (fn []
|
||||
</span><br/>
|
||||
<span class="not-covered" title="0 out of 5 forms covered">
|
||||
080 (let [term (.build (.system (TerminalBuilder/builder) true))
|
||||
</span><br/>
|
||||
<span class="not-covered" title="0 out of 2 forms covered">
|
||||
081 reader (-> (LineReaderBuilder/builder)
|
||||
</span><br/>
|
||||
<span class="not-covered" title="0 out of 2 forms covered">
|
||||
082 (.terminal term)
|
||||
</span><br/>
|
||||
<span class="not-covered" title="0 out of 3 forms covered">
|
||||
083 (.completer (build-completer))
|
||||
073 ;; (count (re-seq #"\]" s))))
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
084 ;; #(.parser % (build-parser))
|
||||
074 ;; s
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
085 (.build))
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
086 ;; apw (AutopairWidgets. reader false)
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
087 ;; asw (AutosuggestionWidgets. reader)
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
088 ]
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
089 ;; (.enable apw)
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
090 ;; (.enable asw)
|
||||
</span><br/>
|
||||
<span class="not-covered" title="0 out of 1 forms covered">
|
||||
091 reader))))
|
||||
</span><br/>
|
||||
<span class="blank" title="0 out of 0 forms covered">
|
||||
092
|
||||
</span><br/>
|
||||
<span class="covered" title="1 out of 1 forms covered">
|
||||
093 (defn read-chars
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
094 "A drop-in replacement for `clojure.core/read-line`, except that line editing
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
095 and history should be enabled.
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
096
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
097 **NOTE THAT** this does not fully work yet, but it is in the API because I
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
098 hope that it will work later!"
|
||||
</span><br/>
|
||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||
099 [prompt]
|
||||
</span><br/>
|
||||
<span class="not-covered" title="0 out of 3 forms covered">
|
||||
100 (let [eddie (get-reader)]
|
||||
</span><br/>
|
||||
<span class="not-covered" title="0 out of 6 forms covered">
|
||||
101 (loop [s (.readLine eddie (str prompt " "))]
|
||||
</span><br/>
|
||||
<span class="not-covered" title="0 out of 12 forms covered">
|
||||
102 (if (and (= (count (re-seq #"\(" s))
|
||||
</span><br/>
|
||||
<span class="not-covered" title="0 out of 5 forms covered">
|
||||
103 (count (re-seq #"\)" s)))
|
||||
</span><br/>
|
||||
<span class="not-covered" title="0 out of 5 forms covered">
|
||||
104 (= (count (re-seq #"\[]" s))
|
||||
</span><br/>
|
||||
<span class="not-covered" title="0 out of 5 forms covered">
|
||||
105 (count (re-seq #"\]" s))))
|
||||
</span><br/>
|
||||
<span class="not-covered" title="0 out of 1 forms covered">
|
||||
106 s
|
||||
</span><br/>
|
||||
<span class="not-covered" title="0 out of 1 forms covered">
|
||||
107 (recur (str s " " (.readLine eddie ":: ")))))))
|
||||
075 ;; (recur (str s " " (.readLine eddie)))))))
|
||||
</span><br/>
|
||||
</body>
|
||||
</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:64.03688524590164%;
|
||||
float:left;"> 625 </div><div class="not-covered"
|
||||
style="width:35.96311475409836%;
|
||||
float:left;"> 351 </div></td>
|
||||
<td class="with-number">64.04 %</td>
|
||||
style="width:63.9344262295082%;
|
||||
float:left;"> 624 </div><div class="not-covered"
|
||||
style="width:36.0655737704918%;
|
||||
float:left;"> 352 </div></td>
|
||||
<td class="with-number">63.93 %</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:76.0914760914761%;
|
||||
float:left;"> 366 </div><div class="not-covered"
|
||||
style="width:23.908523908523907%;
|
||||
float:left;"> 115 </div></td>
|
||||
<td class="with-number">76.09 %</td>
|
||||
style="width:72.34927234927235%;
|
||||
float:left;"> 348 </div><div class="not-covered"
|
||||
style="width:27.65072765072765%;
|
||||
float:left;"> 133 </div></td>
|
||||
<td class="with-number">72.35 %</td>
|
||||
<td class="with-bar"><div class="covered"
|
||||
style="width:78.62068965517241%;
|
||||
float:left;"> 114 </div><div class="partial"
|
||||
style="width:75.17241379310344%;
|
||||
float:left;"> 109 </div><div class="partial"
|
||||
style="width:6.206896551724138%;
|
||||
float:left;"> 9 </div><div class="not-covered"
|
||||
style="width:15.172413793103448%;
|
||||
float:left;"> 22 </div></td>
|
||||
<td class="with-number">84.83 %</td>
|
||||
style="width:18.620689655172413%;
|
||||
float:left;"> 27 </div></td>
|
||||
<td class="with-number">81.38 %</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:73.94366197183099%;
|
||||
float:left;"> 210 </div><div class="not-covered"
|
||||
style="width:26.056338028169016%;
|
||||
float:left;"> 74 </div></td>
|
||||
<td class="with-number">73.94 %</td>
|
||||
style="width:69.47368421052632%;
|
||||
float:left;"> 198 </div><div class="not-covered"
|
||||
style="width:30.526315789473685%;
|
||||
float:left;"> 87 </div></td>
|
||||
<td class="with-number">69.47 %</td>
|
||||
<td class="with-bar"><div class="covered"
|
||||
style="width:78.26086956521739%;
|
||||
float:left;"> 54 </div><div class="partial"
|
||||
style="width:2.898550724637681%;
|
||||
float:left;"> 2 </div><div class="not-covered"
|
||||
style="width:18.840579710144926%;
|
||||
float:left;"> 13 </div></td>
|
||||
<td class="with-number">81.16 %</td>
|
||||
style="width:72.46376811594203%;
|
||||
float:left;"> 50 </div><div class="partial"
|
||||
style="width:5.797101449275362%;
|
||||
float:left;"> 4 </div><div class="not-covered"
|
||||
style="width:21.73913043478261%;
|
||||
float:left;"> 15 </div></td>
|
||||
<td class="with-number">78.26 %</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:56.44047135310849%;
|
||||
float:left;"> 1389 </div><div class="not-covered"
|
||||
style="width:43.55952864689151%;
|
||||
float:left;"> 1072 </div></td>
|
||||
<td class="with-number">56.44 %</td>
|
||||
style="width:42.77384423157018%;
|
||||
float:left;"> 1027 </div><div class="not-covered"
|
||||
style="width:57.22615576842982%;
|
||||
float:left;"> 1374 </div></td>
|
||||
<td class="with-number">42.77 %</td>
|
||||
<td class="with-bar"><div class="covered"
|
||||
style="width:75.37878787878788%;
|
||||
float:left;"> 199 </div><div class="partial"
|
||||
style="width:12.121212121212121%;
|
||||
float:left;"> 32 </div><div class="not-covered"
|
||||
style="width:12.5%;
|
||||
float:left;"> 33 </div></td>
|
||||
<td class="with-number">87.50 %</td>
|
||||
<td class="with-number">589</td><td class="with-number">67</td><td class="with-number">264</td>
|
||||
style="width:53.72549019607843%;
|
||||
float:left;"> 137 </div><div class="partial"
|
||||
style="width:14.509803921568627%;
|
||||
float:left;"> 37 </div><div class="not-covered"
|
||||
style="width:31.764705882352942%;
|
||||
float:left;"> 81 </div></td>
|
||||
<td class="with-number">68.24 %</td>
|
||||
<td class="with-number">571</td><td class="with-number">66</td><td class="with-number">255</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:45.833333333333336%;
|
||||
style="width:46.478873239436616%;
|
||||
float:left;"> 33 </div><div class="partial"
|
||||
style="width:8.333333333333334%;
|
||||
style="width:8.450704225352112%;
|
||||
float:left;"> 6 </div><div class="not-covered"
|
||||
style="width:45.833333333333336%;
|
||||
float:left;"> 33 </div></td>
|
||||
<td class="with-number">54.17 %</td>
|
||||
<td class="with-number">171</td><td class="with-number">12</td><td class="with-number">72</td>
|
||||
style="width:45.070422535211264%;
|
||||
float:left;"> 32 </div></td>
|
||||
<td class="with-number">54.93 %</td>
|
||||
<td class="with-number">171</td><td class="with-number">12</td><td class="with-number">71</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;"> 11 </div></td>
|
||||
float:left;"> 9 </div></td>
|
||||
<td class="with-number">100.00 %</td>
|
||||
<td class="with-bar"><div class="covered"
|
||||
style="width:100.0%;
|
||||
|
|
@ -144,35 +144,31 @@
|
|||
</tr>
|
||||
<tr>
|
||||
<td><a href="beowulf/read.clj.html">beowulf.read</a></td><td class="with-bar"><div class="covered"
|
||||
style="width:54.36893203883495%;
|
||||
float:left;"> 112 </div><div class="not-covered"
|
||||
style="width:45.63106796116505%;
|
||||
float:left;"> 94 </div></td>
|
||||
<td class="with-number">54.37 %</td>
|
||||
style="width:49.43181818181818%;
|
||||
float:left;"> 87 </div><div class="not-covered"
|
||||
style="width:50.56818181818182%;
|
||||
float:left;"> 89 </div></td>
|
||||
<td class="with-number">49.43 %</td>
|
||||
<td class="with-bar"><div class="covered"
|
||||
style="width:61.702127659574465%;
|
||||
float:left;"> 29 </div><div class="partial"
|
||||
style="width:6.382978723404255%;
|
||||
style="width:53.84615384615385%;
|
||||
float:left;"> 21 </div><div class="partial"
|
||||
style="width:7.6923076923076925%;
|
||||
float:left;"> 3 </div><div class="not-covered"
|
||||
style="width:31.914893617021278%;
|
||||
style="width:38.46153846153846%;
|
||||
float:left;"> 15 </div></td>
|
||||
<td class="with-number">68.09 %</td>
|
||||
<td class="with-number">120</td><td class="with-number">10</td><td class="with-number">47</td>
|
||||
<td class="with-number">61.54 %</td>
|
||||
<td class="with-number">108</td><td class="with-number">9</td><td class="with-number">39</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:10.0%;
|
||||
float:left;"> 7 </div><div class="not-covered"
|
||||
style="width:90.0%;
|
||||
float:left;"> 63 </div></td>
|
||||
<td class="with-number">10.00 %</td>
|
||||
style="width:100.0%;
|
||||
float:left;"> 1 </div></td>
|
||||
<td class="with-number">100.00 %</td>
|
||||
<td class="with-bar"><div class="covered"
|
||||
style="width:26.31578947368421%;
|
||||
float:left;"> 5 </div><div class="not-covered"
|
||||
style="width:73.6842105263158%;
|
||||
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>
|
||||
style="width:100.0%;
|
||||
float:left;"> 1 </div></td>
|
||||
<td class="with-number">100.00 %</td>
|
||||
<td class="with-number">75</td><td class="with-number">4</td><td class="with-number">1</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><a href="beowulf/reader/generate.clj.html">beowulf.reader.generate</a></td><td class="with-bar"><div class="covered"
|
||||
|
|
@ -236,9 +232,9 @@
|
|||
</tr>
|
||||
<tr><td>Totals:</td>
|
||||
<td class="with-bar"></td>
|
||||
<td class="with-number">68.60 %</td>
|
||||
<td class="with-number">64.63 %</td>
|
||||
<td class="with-bar"></td>
|
||||
<td class="with-number">77.76 %</td>
|
||||
<td class="with-number">74.41 %</td>
|
||||
</tr>
|
||||
</table>
|
||||
</body>
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -1,19 +1,17 @@
|
|||
<!DOCTYPE html PUBLIC ""
|
||||
"">
|
||||
<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></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>
|
||||
<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>
|
||||
<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="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://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>
|
||||
<p><a href="http://www.paulgraham.com/rootsoflisp.html">The Roots of Lisp, Paul Graham, 2001</a></p>
|
||||
</li>
|
||||
<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>
|
||||
<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>
|
||||
</ol>
|
||||
</div></div></div></body></html>
|
||||
<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://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://dl.acm.org/doi/pdf/10.1145/800055.802047#page=3">Early LISP History (1956 - 1959), Herbert Stoyan, August 1984</a></li>
|
||||
<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>
|
||||
<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>
|
||||
</blockquote></li>
|
||||
</ol></div></div></div></body></html>
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because it is too large
Load diff
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -1 +0,0 @@
|
|||
codox/intro.html
|
||||
14
docs/index.html
Normal file
14
docs/index.html
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
<html>
|
||||
<head>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
|
||||
<title>Beowulf: Documentation</title>
|
||||
<link rel="stylesheet" type="text/css" href="codox/css/default.css" />
|
||||
</head>
|
||||
<body>
|
||||
<h1>Beowulf: Documentation</h1>
|
||||
<ul>
|
||||
<li><a href="codox/index.html">Primary documentaion</a></li>
|
||||
<li><a href="cloverage/index.html">Test coverage</a></li>
|
||||
</ul>
|
||||
</body>
|
||||
</html>
|
||||
23
project.clj
23
project.clj
|
|
@ -1,12 +1,17 @@
|
|||
(defproject beowulf "0.3.1-SNAPSHOT"
|
||||
(defproject beowulf "0.3.0"
|
||||
:aot :all
|
||||
:cloverage {:output "docs/cloverage"
|
||||
:ns-exclude-regex [#"beowulf\.gendoc" #"beowulf\.scratch"]}
|
||||
:codox {:metadata {:doc "**TODO**: write docs"
|
||||
:codox {:html {:transforms [[:head] [:append
|
||||
[: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"}
|
||||
|
|
@ -18,17 +23,15 @@
|
|||
[clojure.java-time "1.2.0"]
|
||||
[environ "1.2.0"]
|
||||
[instaparse "1.4.12"]
|
||||
[org.jline/jline "3.23.0"]
|
||||
[com.github.seancorfield/expectations "2.0.165"]
|
||||
;; [rhizome "0.2.9"] ;; not needed in production builds
|
||||
;; [org.jline/jline "3.23.0"]
|
||||
[rhizome "0.2.9"] ;; not needed in production builds
|
||||
]
|
||||
:main beowulf.core
|
||||
:plugins [[lein-cloverage "1.2.2"]
|
||||
[lein-codox "0.10.8"]
|
||||
[lein-codox "0.10.7"]
|
||||
[lein-environ "1.1.0"]]
|
||||
:profiles {:jar {:aot :all}
|
||||
:uberjar {:aot :all}
|
||||
:dev {:resource-paths ["resources"]}}
|
||||
:uberjar {:aot :all}}
|
||||
:release-tasks [["vcs" "assert-committed"]
|
||||
["change" "version" "leiningen.release/bump-version" "release"]
|
||||
["vcs" "commit"]
|
||||
|
|
@ -39,4 +42,4 @@
|
|||
["change" "version" "leiningen.release/bump-version"]
|
||||
["vcs" "commit"]]
|
||||
:target-path "target/%s"
|
||||
:url "https://github.com/simon-brooke/beowulf")
|
||||
:url "https://github.com/simon-brooke/the-great-game")
|
||||
|
|
|
|||
|
|
@ -1,563 +0,0 @@
|
|||
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;
|
||||
}
|
||||
|
|
@ -1,97 +0,0 @@
|
|||
/*
|
||||
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;
|
||||
}
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
{: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"}]]]}
|
||||
1
resources/codox/themes/journeyman/theme.edn
Normal file
1
resources/codox/themes/journeyman/theme.edn
Normal file
|
|
@ -0,0 +1 @@
|
|||
{:resources ["css/default.css" "css/highlight.css"]}
|
||||
|
|
@ -25,7 +25,6 @@
|
|||
(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))))))
|
||||
|
|
@ -56,16 +55,6 @@
|
|||
(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
|
||||
|
|
@ -181,7 +170,6 @@
|
|||
(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
|
||||
|
|
@ -199,7 +187,6 @@
|
|||
(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))
|
||||
|
|
|
|||
|
|
@ -1,7 +1 @@
|
|||
;; 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))))
|
||||
;; TODO
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
;; Common Lisp
|
||||
|
||||
(defun range (max &key (min 0) (step 1))
|
||||
(loop for n from min below max by step
|
||||
collect n))
|
||||
|
||||
(mapcar #'(lambda (x) (+ x 1)) (range 10))
|
||||
|
||||
(defun factoriali (n)
|
||||
(reduce #'* (range (+ n 1) :min 1 :step 1)))
|
||||
|
||||
(defun factorialr (n)
|
||||
(cond ((= n 1) 1)
|
||||
(t (* n (factorialr (- n 1))))))
|
||||
|
||||
|
||||
;; Clojure
|
||||
(defn factorial [n]
|
||||
(reduce *' (range 1 (+ n 1))))
|
||||
|
||||
(defn expt [n x]
|
||||
(reduce *' (repeat x n)))
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
;; Bottom of page 66
|
||||
|
||||
(PUT 'SELECT 'FEXPR
|
||||
'(LABEL FORM
|
||||
(PROG (Q BODY)
|
||||
(SETQ Q (EVAL (CAR FORM))) ;; not sure that Q should be evaled.
|
||||
(SETQ BODY (CDR FORM))
|
||||
LOOP
|
||||
(COND
|
||||
((EQ NIL (CDR BODY)) (RETURN (CAR BODY)))
|
||||
((EQ Q (EVAL (CAAR BODY))) (RETURN (CDAR BODY))))
|
||||
(SETQ BODY (CDR BODY))
|
||||
(GO LOOP))))
|
||||
|
|
@ -11,11 +11,9 @@
|
|||
objects."
|
||||
(:require [beowulf.cons-cell :refer [F make-beowulf-list make-cons-cell
|
||||
pretty-print T]]
|
||||
[beowulf.host :refer [ASSOC ATOM CAAR CAADR CADAR CADDR CADR CAR CDR
|
||||
CONS ERROR GET LIST NUMBERP PAIRLIS traced?]]
|
||||
[beowulf.oblist :refer [*options* NIL]]
|
||||
[clojure.string :as s]
|
||||
[clojure.tools.trace :refer [deftrace]])
|
||||
[beowulf.host :refer [ASSOC ATOM CAAR CADAR CADDR CADR CAR CDR GET
|
||||
LIST NUMBERP PAIRLIS traced?]]
|
||||
[beowulf.oblist :refer [*options* NIL oblist]])
|
||||
(:import [beowulf.cons_cell ConsCell]
|
||||
[clojure.lang Symbol]))
|
||||
|
||||
|
|
@ -39,20 +37,10 @@
|
|||
;;;
|
||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
|
||||
(declare APPLY EVAL EVCON prog-eval)
|
||||
(declare APPLY EVAL prog-eval)
|
||||
|
||||
;;;; 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)
|
||||
|
||||
(defn- trace-indent
|
||||
([] (trace-indent *depth*))
|
||||
([d] (s/join (repeat d " "))))
|
||||
|
||||
(def find-target
|
||||
(memoize
|
||||
(fn [target body]
|
||||
|
|
@ -94,45 +82,30 @@
|
|||
(cond
|
||||
(number? expr) expr
|
||||
(symbol? expr) (@vars expr)
|
||||
(instance? ConsCell expr) (case (CAR expr)
|
||||
COND (prog-cond (CDR expr)
|
||||
(instance? ConsCell expr) (case (.getCar expr)
|
||||
COND (prog-cond (.getCdr expr)
|
||||
vars env depth)
|
||||
GO (let [target (CADR expr)]
|
||||
(when (traced? 'PROG)
|
||||
(println " PROG:GO: Goto " target))
|
||||
(make-cons-cell
|
||||
'*PROGGO* target))
|
||||
RETURN (let [val (prog-eval
|
||||
(CADR expr)
|
||||
vars env depth)]
|
||||
(when (traced? 'PROG)
|
||||
(println " PROG:RETURN: Returning "
|
||||
val))
|
||||
(make-cons-cell
|
||||
'*PROGRETURN*
|
||||
val))
|
||||
SET (let [var (prog-eval (CADR expr)
|
||||
vars env depth)
|
||||
val (prog-eval (CADDR expr)
|
||||
vars env depth)]
|
||||
(when (traced? 'PROG)
|
||||
(println " PROG:SET: Setting "
|
||||
var " to " val))
|
||||
GO (make-cons-cell
|
||||
'*PROGGO* (.getCar (.getCdr expr)))
|
||||
RETURN (make-cons-cell
|
||||
'*PROGRETURN*
|
||||
(prog-eval (.getCar (.getCdr expr))
|
||||
vars env depth))
|
||||
SET (let [v (CADDR expr)]
|
||||
(swap! vars
|
||||
assoc
|
||||
var
|
||||
val)
|
||||
val)
|
||||
SETQ (let [var (CADDR expr)
|
||||
val (prog-eval var
|
||||
vars env depth)]
|
||||
(when (traced? 'PROG)
|
||||
(println " PROG:SETQ: Setting " var " to " val))
|
||||
(prog-eval (CADR expr)
|
||||
vars env depth)
|
||||
(prog-eval (CADDR expr)
|
||||
vars env depth))
|
||||
v)
|
||||
SETQ (let [v (CADDR expr)]
|
||||
(swap! vars
|
||||
assoc
|
||||
(CADR expr)
|
||||
val)
|
||||
val)
|
||||
(prog-eval v
|
||||
vars env depth))
|
||||
v)
|
||||
;; else
|
||||
(beowulf.bootstrap/EVAL expr
|
||||
(merge-vars vars env)
|
||||
|
|
@ -200,7 +173,7 @@
|
|||
(println "Program:")
|
||||
(pretty-print program))) ;; for debugging
|
||||
(loop [cursor body]
|
||||
(let [step (if (= NIL cursor) NIL (.getCar cursor))]
|
||||
(let [step (.getCar cursor)]
|
||||
(when trace (do (println "Executing step: " step)
|
||||
(println " with vars: " @vars)))
|
||||
(cond (= cursor NIL) NIL
|
||||
|
|
@ -233,7 +206,7 @@
|
|||
with these `args` at this depth."
|
||||
[function-symbol args depth]
|
||||
(when (traced? function-symbol)
|
||||
(let [indent (trace-indent depth)]
|
||||
(let [indent (apply str (repeat depth "-"))]
|
||||
(println (str indent "> " function-symbol " " args)))))
|
||||
|
||||
(defn- trace-response
|
||||
|
|
@ -241,13 +214,11 @@
|
|||
`function-symbol` at this depth."
|
||||
[function-symbol response depth]
|
||||
(when (traced? function-symbol)
|
||||
(let [indent (apply str (trace-indent depth))]
|
||||
(let [indent (apply str (repeat depth "-"))]
|
||||
(println (str "<" indent " " function-symbol " " response))))
|
||||
response)
|
||||
|
||||
;;;; Support functions for interpreter ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
|
||||
(defn value
|
||||
(defn- value
|
||||
"Seek a value for this symbol `s` by checking each of these indicators in
|
||||
turn."
|
||||
([s]
|
||||
|
|
@ -257,21 +228,6 @@
|
|||
(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
|
||||
|
|
@ -292,7 +248,7 @@
|
|||
return the result."
|
||||
[^Symbol function-symbol args ^ConsCell environment depth]
|
||||
(trace-call function-symbol args depth)
|
||||
(let [lisp-fn (value function-symbol '(EXPR FEXPR)) ;; <-- should these be handled differently? I think so!
|
||||
(let [lisp-fn (value function-symbol '(EXPR FEXPR))
|
||||
args' (cond (= NIL args) args
|
||||
(empty? args) NIL
|
||||
(instance? ConsCell args) args
|
||||
|
|
@ -319,43 +275,6 @@
|
|||
(trace-response function-symbol result depth)
|
||||
result))
|
||||
|
||||
;; (LABEL ARGS
|
||||
;; (COND ((COND ((ONEP (LENGTH ARGS)) ARGS)
|
||||
;; (T (ATTRIB (CAR ARGS) (APPLY CONC (CDR ARGS) NIL))))
|
||||
;; ARGS)))
|
||||
;; ((1 2 3 4) (5 6 7 8) (9 10 11 12))
|
||||
;; NIL
|
||||
;; (def function (make-beowulf-list '(LABEL ARGS (COND
|
||||
;; ((COND ((ONEP (LENGTH ARGS)) ARGS)
|
||||
;; (T (ATTRIB (CAR ARGS)
|
||||
;; (APPLY CONC (CDR ARGS) NIL))))
|
||||
;; ARGS)))))
|
||||
;; (def args (make-beowulf-list '((1 2 3 4) (5 6 7 8) (9 10 11 12))))
|
||||
|
||||
;; function
|
||||
;; (CADR function)
|
||||
;; (CADDR function)
|
||||
|
||||
(defn apply-label
|
||||
"Apply in the special case that the first element in the function is `LABEL`."
|
||||
[function args environment depth]
|
||||
(EVAL
|
||||
(CADDR function)
|
||||
(CONS
|
||||
(CONS (CADR function) args)
|
||||
environment)
|
||||
depth))
|
||||
|
||||
;; (apply-label function args NIL 1)
|
||||
;; (APPLY function args NIL 1)
|
||||
|
||||
(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.
|
||||
|
|
@ -363,34 +282,38 @@
|
|||
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]
|
||||
(APPLY function args environment *depth*))
|
||||
([function args environment depth]
|
||||
(binding [*depth* (inc depth)]
|
||||
(trace-call 'APPLY (list function args environment) depth)
|
||||
(let [result (cond
|
||||
(= NIL function) (if (:strict *options*)
|
||||
NIL
|
||||
(throw (ex-info "NIL sí ne þegnung"
|
||||
{:phase :apply
|
||||
:function "NIL"
|
||||
:args args
|
||||
:type :beowulf})))
|
||||
(= (ATOM function) T) (apply-symbolic function args environment (inc depth))
|
||||
:else (case (first function)
|
||||
LABEL (apply-label function args environment depth)
|
||||
FUNARG (APPLY (CADR function) args (CADDR function) depth)
|
||||
LAMBDA (apply-lambda function args environment depth)
|
||||
;; else
|
||||
;; OK, this is *not* what is says in the manual...
|
||||
;; COND (EVCON ???)
|
||||
(throw (ex-info "Ungecnáwen wyrþan sí þegnung-weard"
|
||||
{:phase :apply
|
||||
:function function
|
||||
:args args
|
||||
:type :beowulf}))))]
|
||||
(trace-response 'APPLY result depth)
|
||||
result))))
|
||||
[function args environment depth]
|
||||
(trace-call 'APPLY (list function args environment) depth)
|
||||
(let [result (cond
|
||||
(= NIL function) (if (:strict *options*)
|
||||
NIL
|
||||
(throw (ex-info "NIL sí ne þegnung"
|
||||
{:phase :apply
|
||||
:function "NIL"
|
||||
:args args
|
||||
:type :beowulf})))
|
||||
(= (ATOM function) T) (apply-symbolic function args environment (inc depth))
|
||||
:else (case (first function)
|
||||
LABEL (APPLY
|
||||
(CADDR function)
|
||||
args
|
||||
(make-cons-cell
|
||||
(make-cons-cell
|
||||
(CADR function)
|
||||
(CADDR function))
|
||||
environment)
|
||||
depth)
|
||||
FUNARG (APPLY (CADR function) args (CADDR function) depth)
|
||||
LAMBDA (EVAL
|
||||
(CADDR function)
|
||||
(PAIRLIS (CADR function) args environment) depth)
|
||||
(throw (ex-info "Ungecnáwen wyrþan sí þegnung-weard"
|
||||
{:phase :apply
|
||||
:function function
|
||||
:args args
|
||||
:type :beowulf}))))]
|
||||
(trace-response 'APPLY result depth)
|
||||
result))
|
||||
|
||||
;;;; EVAL ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
|
||||
|
|
@ -438,12 +361,12 @@
|
|||
(println (str indent ": EVAL: sceald bindele: " (or v "nil"))))
|
||||
(if (instance? ConsCell v)
|
||||
(.getCdr v)
|
||||
(let [v' (value expr)]
|
||||
(let [v' (value expr (list 'APVAL))]
|
||||
(when (traced? 'EVAL)
|
||||
(println (str indent ": EVAL: deóp bindele: (" expr " . " (or v' "nil") ")")))
|
||||
(if v'
|
||||
v'
|
||||
(throw (ex-info (format "Ne tácen-bindele āfand: `%s`" expr)
|
||||
(throw (ex-info "Ne tácen-bindele āfand"
|
||||
{:phase :eval
|
||||
:function 'EVAL
|
||||
:args (list expr env depth)
|
||||
|
|
@ -489,10 +412,11 @@
|
|||
(EVLIS (CDR expr) env depth)
|
||||
env
|
||||
depth))
|
||||
:else (EVAL (CONS (CDR (SASSOC (CAR expr) env (fn [] (ERROR 'A9))))
|
||||
(CDR expr))
|
||||
env
|
||||
(inc depth)))]
|
||||
:else (APPLY
|
||||
(CAR expr)
|
||||
(EVLIS (CDR expr) env depth)
|
||||
env
|
||||
depth))]
|
||||
(trace-response 'EVAL result depth)
|
||||
result)))
|
||||
|
||||
|
|
|
|||
|
|
@ -53,8 +53,7 @@
|
|||
(.canRead (io/file %)))
|
||||
"Could not find sysout file"]]
|
||||
["-s" "--strict" "Strictly interpret the Lisp 1.5 language, without extensions."]
|
||||
["-t" "--time" "Time evaluations."]
|
||||
["-x" "--testing" "Disable the jline reader - useful when piping input."]])
|
||||
["-t" "--time" "Time evaluations."]])
|
||||
|
||||
(defn- re
|
||||
"Like REPL, but it isn't a loop and doesn't print."
|
||||
|
|
@ -65,9 +64,10 @@
|
|||
"Read/eval/print loop."
|
||||
[prompt]
|
||||
(loop []
|
||||
(print prompt)
|
||||
(flush)
|
||||
(try
|
||||
(if-let [input (trim (read-from-console prompt))]
|
||||
(if-let [input (trim (read-from-console))]
|
||||
(if (= input stop-word)
|
||||
(throw (ex-info "\nFærwell!" {:cause :quit}))
|
||||
(println
|
||||
|
|
@ -116,7 +116,7 @@
|
|||
(catch Throwable any
|
||||
(println any))))
|
||||
(try
|
||||
(repl (:prompt (:options args)))
|
||||
(repl (str (:prompt (:options args)) " "))
|
||||
(catch
|
||||
Exception
|
||||
e
|
||||
|
|
|
|||
|
|
@ -91,21 +91,22 @@
|
|||
(cond
|
||||
(= l NIL) NIL
|
||||
(empty? path) l
|
||||
(not (instance? ConsCell l)) (throw (ex-info (str "Ne liste: "
|
||||
l "; " (type l))
|
||||
{:phase :eval
|
||||
:function "universal access function"
|
||||
:args [l path]
|
||||
:type :beowulf}))
|
||||
:else (case (last path)
|
||||
\a (uaf (.first l) (butlast path))
|
||||
\d (uaf (.getCdr l) (butlast path))
|
||||
(throw (ex-info (str "uaf: unexpected letter in path (only `a` and `d` permitted): "
|
||||
(last path))
|
||||
{:phase :eval
|
||||
:function "universal access function"
|
||||
:args [l path]
|
||||
:type :beowulf})))))
|
||||
:else
|
||||
(try
|
||||
(case (last path)
|
||||
\a (uaf (.first l) (butlast path))
|
||||
\d (uaf (.getCdr l) (butlast path))
|
||||
(throw (ex-info (str "uaf: unexpected letter in path (only `a` and `d` permitted): " (last path))
|
||||
{:cause :uaf
|
||||
:detail :unexpected-letter
|
||||
:expr (last path)})))
|
||||
(catch ClassCastException e
|
||||
(throw (ex-info
|
||||
(str "uaf: Not a LISP list? " (type l))
|
||||
{:cause :uaf
|
||||
:detail :not-a-lisp-list
|
||||
:expr l}
|
||||
e))))))
|
||||
|
||||
(defmacro CAAR [x] `(uaf ~x '(\a \a)))
|
||||
(defmacro CADR [x] `(uaf ~x '(\a \d)))
|
||||
|
|
@ -216,7 +217,7 @@
|
|||
:phase :host
|
||||
:detail :rplacd
|
||||
:args (list cell value)
|
||||
:type :beowulf}))))
|
||||
:type :beowulf}))));; PLUS
|
||||
|
||||
(defn LIST
|
||||
[& args]
|
||||
|
|
@ -432,41 +433,6 @@
|
|||
"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.
|
||||
|
|
@ -474,27 +440,22 @@
|
|||
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]
|
||||
(let [binding (ASSOC symbol @oblist)]
|
||||
(if (instance? ConsCell binding)
|
||||
(let [prop (hit-or-miss-assoc indicator (CDDR binding))]
|
||||
(if (instance? ConsCell prop)
|
||||
(RPLACA (CDR prop) value)
|
||||
;; The implication is ATTRIB was used here, but I have not made that
|
||||
;; work and this does work, so if it ain't broke don't fix it.
|
||||
(RPLACD binding
|
||||
(make-cons-cell
|
||||
magic-marker
|
||||
(make-cons-cell
|
||||
indicator
|
||||
(make-cons-cell value (CDDR binding)))))))
|
||||
(swap!
|
||||
oblist
|
||||
(fn [ob s p v]
|
||||
(make-cons-cell
|
||||
(make-beowulf-list (list s magic-marker p v))
|
||||
ob))
|
||||
symbol indicator value)))
|
||||
value)
|
||||
(if-let [binding (ASSOC symbol @oblist)]
|
||||
(if-let [prop (ASSOC indicator (CDDR binding))]
|
||||
(RPLACD prop value)
|
||||
(RPLACD binding
|
||||
(make-cons-cell
|
||||
magic-marker
|
||||
(make-cons-cell
|
||||
indicator
|
||||
(make-cons-cell value (CDDR binding))))))
|
||||
(swap!
|
||||
oblist
|
||||
(fn [ob s p v]
|
||||
(make-cons-cell
|
||||
(make-beowulf-list (list s magic-marker p v))
|
||||
ob))
|
||||
symbol indicator value)))
|
||||
|
||||
(defn GET
|
||||
"From the manual:
|
||||
|
|
@ -516,9 +477,13 @@
|
|||
val (cond
|
||||
(= binding NIL) NIL
|
||||
(= magic-marker
|
||||
(CADR binding)) (let [p (hit-or-miss-assoc indicator binding)]
|
||||
(if-not (= NIL p)
|
||||
(CADR p)
|
||||
(CADR binding)) (loop [b binding]
|
||||
;; (println "GET loop, seeking " indicator ":")
|
||||
;; (pretty-print b)
|
||||
(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)"
|
||||
|
|
@ -534,10 +499,9 @@
|
|||
`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]
|
||||
(doall
|
||||
(map
|
||||
#(when (PUT (CAR %) indicator (CDR %)) (CAR %))
|
||||
a-list)))
|
||||
(map
|
||||
#(PUT (CAR %) indicator (CDR %))
|
||||
a-list))
|
||||
|
||||
(defn DEFINE
|
||||
"Bootstrap-only version of `DEFINE` which, post boostrap, can be overwritten
|
||||
|
|
|
|||
|
|
@ -91,8 +91,7 @@
|
|||
([]
|
||||
(SYSOUT nil))
|
||||
([filepath]
|
||||
(let [destination (full-path (str filepath))]
|
||||
(spit destination
|
||||
(spit (full-path (str filepath))
|
||||
(with-out-str
|
||||
(println (apply str (repeat 79 ";")))
|
||||
(println (format ";; Beowulf %s Sysout file generated at %s"
|
||||
|
|
@ -104,9 +103,7 @@
|
|||
(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
|
||||
|
|
|
|||
|
|
@ -41,5 +41,5 @@
|
|||
|
||||
(def ^:dynamic *options*
|
||||
"Command line options from invocation."
|
||||
{:testing true})
|
||||
{})
|
||||
|
||||
|
|
|
|||
|
|
@ -13,14 +13,13 @@
|
|||
|
||||
Both these extensions can be disabled by using the `--strict` command line
|
||||
switch."
|
||||
(:require [beowulf.oblist :refer [*options*]]
|
||||
[beowulf.reader.char-reader :refer [read-chars]]
|
||||
(:require ;; [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 [instaparse.gll Failure]
|
||||
[java.io InputStream]))
|
||||
(:import [java.io InputStream]
|
||||
[instaparse.gll Failure]))
|
||||
|
||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
;;;
|
||||
|
|
@ -83,35 +82,24 @@
|
|||
(throw (ex-info "Ne can forstande " (assoc parse-tree :source source))))
|
||||
(generate (simplify parse-tree)))))
|
||||
|
||||
(defn- dummy-read-chars [prompt]
|
||||
(loop [r "" p prompt]
|
||||
(if (and (seq r)
|
||||
(= (count (re-seq #"\(" r))
|
||||
(count (re-seq #"\)" r)))
|
||||
(defn read-from-console
|
||||
"Attempt to read a complete lisp expression from the console. NOTE that this
|
||||
will only really work for S-Expressions, not M-Expressions."
|
||||
[]
|
||||
(loop [r (read-line)]
|
||||
(if (and (= (count (re-seq #"\(" r))
|
||||
(count (re-seq #"\)" r)))
|
||||
(= (count (re-seq #"\[" r))
|
||||
(count (re-seq #"\]" r))))
|
||||
r
|
||||
(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)))
|
||||
(recur (str r "\n" (read-line))))))
|
||||
|
||||
(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 (:prompt *options*))))
|
||||
(gsp (read-from-console)))
|
||||
([input]
|
||||
(cond
|
||||
(empty? input) (READ)
|
||||
|
|
|
|||
|
|
@ -20,12 +20,9 @@
|
|||
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"
|
||||
(:require [beowulf.oblist :refer [*options* oblist]])
|
||||
(: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]))
|
||||
;; (:import [org.jline.reader LineReader LineReaderBuilder]
|
||||
;; [org.jline.terminal TerminalBuilder])
|
||||
)
|
||||
|
||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
;;;
|
||||
|
|
@ -52,56 +49,27 @@
|
|||
;; looks as though you'd need a DPhil in JLine to write it, and I don't have
|
||||
;; the time.
|
||||
|
||||
(defn build-completer
|
||||
"Build a completer which takes tokens from the oblist.
|
||||
;; (def get-reader
|
||||
;; "Return a reader, first constructing it if necessary.
|
||||
|
||||
This is sort-of working, in as much as hitting <TAB> on a blank line will
|
||||
show a table of values from the oblist, but hitting <TAB> after you've
|
||||
started input does not show potential completions for tokens you've started."
|
||||
[]
|
||||
(StringsCompleter. (map #(str (first %)) @oblist)))
|
||||
;; **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))]
|
||||
;; (.build (.terminal (LineReaderBuilder/builder) term))))))
|
||||
|
||||
;; This breaks; it is not correctly resolving the Enum, although I can't work out
|
||||
;; why not.
|
||||
;; (defn build-parser
|
||||
;; (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 work yet, but it is in the API because I hope
|
||||
;; that it will work later!"
|
||||
;; []
|
||||
;; (println "Building parser")
|
||||
;; (let [parser (DefaultParser.)]
|
||||
;; (doall
|
||||
;; (.setEofOnUnclosedBracket
|
||||
;; parser DefaultParser$Bracket/ROUND))))
|
||||
|
||||
(def get-reader
|
||||
"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 ":: ")))))))
|
||||
;; (let [eddie (get-reader)]
|
||||
;; (loop [s (.readLine eddie)]
|
||||
;; (if (and (= (count (re-seq #"\(" s))
|
||||
;; (count (re-seq #"\)" s)))
|
||||
;; (= (count (re-seq #"\[]" s))
|
||||
;; (count (re-seq #"\]" s))))
|
||||
;; s
|
||||
;; (recur (str s " " (.readLine eddie)))))))
|
||||
|
|
@ -1,9 +1,8 @@
|
|||
(ns beowulf.core-test
|
||||
(:require [beowulf.core :refer [-main repl stop-word]]
|
||||
[beowulf.oblist :refer [*options*]]
|
||||
[clojure.java.io :refer [reader]]
|
||||
[clojure.string :refer [split starts-with?]]
|
||||
[clojure.test :refer [deftest is testing]]))
|
||||
(:require [clojure.java.io :refer [reader]]
|
||||
[clojure.string :refer [split]]
|
||||
[clojure.test :refer [deftest is testing]]
|
||||
[beowulf.core :refer [-main repl stop-word]]))
|
||||
|
||||
;; (deftest a-test
|
||||
;; (testing "FIXME, I fail."
|
||||
|
|
@ -21,20 +20,20 @@
|
|||
(deftest repl-tests
|
||||
(testing "quit functionality"
|
||||
(with-open [r (reader (string->stream stop-word))]
|
||||
(binding [clojure.core/*in* r
|
||||
*options* (assoc *options* :testing true)]
|
||||
(binding [*in* r]
|
||||
(is (thrown-with-msg? Exception #"\nFærwell!" (repl "")))))
|
||||
|
||||
(let [expected nil
|
||||
actual (with-open [r (reader (string->stream stop-word))]
|
||||
(binding [*in* r]
|
||||
(-main "--testing")))]
|
||||
(-main)))]
|
||||
(is (= actual expected)))))
|
||||
|
||||
;; The new read-chars interface is really messing with this. Need to sort out!
|
||||
;; 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
|
||||
;; TODO: not working because STOP is not being recognised, but I haven't
|
||||
;; worked out why not yet. It *did* work.
|
||||
|
||||
(deftest flag-tests
|
||||
(testing "Only testing flag"
|
||||
(testing "No flags"
|
||||
(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\)"
|
||||
|
|
@ -42,22 +41,24 @@
|
|||
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::
|
||||
;; Færwell!
|
||||
; Sprecan:: > (3 . 4)
|
||||
; Sprecan::
|
||||
; 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 "--testing")) #"\n")))]
|
||||
(split (with-out-str (-main)) #"\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")
|
||||
|
|
@ -68,63 +69,115 @@
|
|||
[_ 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" "--testing")) #"\n")))]
|
||||
(split (with-out-str (-main "--unknown")) #"\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))))
|
||||
;; ;; TODO: not working because STOP is not being recognised, but I haven't
|
||||
;; ;; worked out why not yet. It *did* work.
|
||||
|
||||
;; Hider wilcuman. Béowulf is mín nama.
|
||||
;; -f FILEPATH, --file-path FILEPATH Set the path to the directory for reading and writing Lisp files.
|
||||
;; -h, --help
|
||||
;; -p PROMPT, --prompt PROMPT Sprecan:: Set the REPL prompt to PROMPT
|
||||
;; -r SYSOUTFILE, --read SYSOUTFILE lisp1.5.lsp Read Lisp system from file SYSOUTFILE
|
||||
;; -s, --strict Strictly interpret the Lisp 1.5 language, without extensions.
|
||||
;; -t, --time Time evaluations.
|
||||
;; -x, --testing Disable the jline reader - useful when piping input.
|
||||
;; Sprecan 'STOP' tó laéfan
|
||||
|
||||
;; Sprecan::
|
||||
|
||||
(testing "help"
|
||||
(let [expected-greeting "Hider wilcuman. Béowulf is mín nama."
|
||||
expected-h1 " -h, --help"
|
||||
expected-quit-message (str "Sprecan '" stop-word "' tó laéfan")
|
||||
expected-result #".*\(A \. B\)"
|
||||
expected-prompt "Sprecan:: "
|
||||
expected-signoff "Færwell!"
|
||||
[_ greeting _ _ h1 _ _ _ _ _ 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 "--help" "--testing")) #"\n")))]
|
||||
(is (= greeting expected-greeting))
|
||||
(is (= h1 expected-h1))
|
||||
(is (re-matches expected-result result))
|
||||
(is (= quit-message expected-quit-message))
|
||||
(is (starts-with? prompt expected-prompt))
|
||||
(is (= signoff expected-signoff))))
|
||||
(testing "prompt"
|
||||
(let [expected-prompt "? "
|
||||
[_ _ _ _ _ _ prompt _]
|
||||
(with-open [r (reader (string->stream stop-word))]
|
||||
(binding [*in* r]
|
||||
(split (with-out-str (-main "--prompt" "?" "--testing")) #"\n")))]
|
||||
(is (= prompt expected-prompt))))
|
||||
(testing "read - file not found"
|
||||
(let [expected-error #"Failed to validate.*"
|
||||
[_ _ _ error _ _ _ _ _]
|
||||
(with-open [r (reader (string->stream (str "cons[A; B]\n" stop-word)))]
|
||||
(binding [*in* r]
|
||||
(split (with-out-str (-main "--testing" "--read" "froboz")) #"\n")))]
|
||||
(is (re-matches expected-error error))))
|
||||
(testing "strict"
|
||||
(let [expected-result #".*Cannot parse meta expressions in strict mode.*"
|
||||
[_ _ _ _ _ _ result _ _]
|
||||
(with-open [r (reader (string->stream (str "cons[A; B]\n" stop-word)))]
|
||||
(binding [*in* r]
|
||||
(split (with-out-str (-main "--strict" "--testing")) #"\n")))]
|
||||
(is (re-matches expected-result result )))))
|
||||
(is (= signoff expected-signoff))
|
||||
))
|
||||
; (testing "help"
|
||||
; (let [expected-greeting "Hider wilcuman. Béowulf is mín nama."
|
||||
; expected-h1 " -h, --help"
|
||||
; expected-quit-message (str "Sprecan '" stop-word "' tó laéfan")
|
||||
; expected-result #".*\(A \. B\)"
|
||||
; expected-prompt "Sprecan:: "
|
||||
; expected-signoff "Færwell!"
|
||||
; [_ greeting _ h1 _ _ _ _ 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 "--help")) #"\n")))]
|
||||
; (is (= greeting expected-greeting))
|
||||
; (is (= h1 expected-h1))
|
||||
; (is (re-matches expected-result result))
|
||||
; (is (= quit-message expected-quit-message))
|
||||
; (is (= prompt expected-prompt))
|
||||
; (is (= signoff expected-signoff))
|
||||
; ))
|
||||
; (testing "prompt"
|
||||
; (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 "? "
|
||||
; expected-signoff "Færwell!"
|
||||
; [_ greeting _ error quit-message _ result prompt signoff]
|
||||
; (with-open [r (reader (string->stream (str stop-word)))]
|
||||
; (binding [*in* r]
|
||||
; (split (with-out-str (-main "--prompt" "?")) #"\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 "read - file not found"
|
||||
; (let [expected-greeting "Hider wilcuman. Béowulf is mín nama."
|
||||
; expected-quit-message (str "Sprecan '" stop-word "' tó laéfan")
|
||||
; expected-error #"Failed to validate.*"
|
||||
; 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" "froboz")) #"\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))
|
||||
; ))
|
||||
; (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))
|
||||
)
|
||||
|
|
@ -1,66 +1,38 @@
|
|||
(ns beowulf.host-test
|
||||
(:require [beowulf.cons-cell :refer [F make-beowulf-list make-cons-cell T]]
|
||||
[beowulf.host :refer [ADD1 AND CADDDR CAR CDR DEFINE DIFFERENCE
|
||||
ERROR FIXP GREATERP lax? LESSP NILP NULL
|
||||
NUMBERP OR PLUS RPLACA RPLACD SUB1 TIMES uaf]]
|
||||
[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))))))
|
||||
(:require [clojure.test :refer [deftest is testing]]
|
||||
[beowulf.cons-cell :refer [F make-beowulf-list T]]
|
||||
[beowulf.host :refer [CDR DIFFERENCE NUMBERP PLUS RPLACA RPLACD TIMES]]
|
||||
[beowulf.oblist :refer [NIL]]
|
||||
[beowulf.read :refer [gsp]]))
|
||||
|
||||
(deftest destructive-change-test
|
||||
(testing "RPLACA"
|
||||
(let
|
||||
[l (make-beowulf-list '(A B C D E))
|
||||
target (CDR l)
|
||||
expected "(A F C D E)"
|
||||
actual (do (RPLACA target 'F) (print-str l))]
|
||||
[l (make-beowulf-list '(A B C D E))
|
||||
target (CDR l)
|
||||
expected "(A F C D E)"
|
||||
actual (do (RPLACA target 'F) (print-str l))]
|
||||
(is (= actual expected)))
|
||||
(is (thrown-with-msg?
|
||||
Exception
|
||||
#"Un-ġefōg þing in RPLACA.*"
|
||||
(RPLACA (make-beowulf-list '(A B C D E)) "F"))
|
||||
Exception
|
||||
#"Un-ġefōg þing in RPLACA.*"
|
||||
(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
|
||||
#"Uncynlic miercels in RPLACA.*"
|
||||
(RPLACA '(A B C D E) 'F))
|
||||
"You can't RPLACA into anything which isn't a MutableSequence."))
|
||||
(testing "RPLACD"
|
||||
Exception
|
||||
#"Uncynlic miercels in RPLACA.*"
|
||||
(RPLACA '(A B C D E) 'F))
|
||||
"You can't RPLACA into anything which isn't a MutableSequence.")
|
||||
)
|
||||
(testing "RPLACA"
|
||||
(let
|
||||
[l (make-beowulf-list '(A B C D E))
|
||||
target (CDR l)
|
||||
expected "(A B . F)"
|
||||
actual (do (RPLACD target 'F) (print-str l))]
|
||||
[l (make-beowulf-list '(A B C D E))
|
||||
target (CDR l)
|
||||
expected "(A B . F)"
|
||||
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"
|
||||
|
|
@ -87,171 +59,12 @@
|
|||
(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))))
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
(ns beowulf.lisp-test
|
||||
"The idea here is to test actual Lisp functions"
|
||||
(:require [beowulf.bootstrap :refer [EVAL]]
|
||||
(:require [clojure.test :refer [deftest testing is use-fixtures]]
|
||||
[beowulf.bootstrap :refer [EVAL]]
|
||||
[beowulf.cons-cell :refer [make-beowulf-list]]
|
||||
[beowulf.io :refer [SYSIN]] ;; [beowulf.oblist :refer [NIL]]
|
||||
[beowulf.oblist :refer [NIL]]
|
||||
[beowulf.read :refer [READ]]
|
||||
[clojure.test :refer [deftest is testing use-fixtures]]))
|
||||
[beowulf.io :refer [SYSIN]]
|
||||
;; [beowulf.oblist :refer [NIL]]
|
||||
[beowulf.read :refer [READ]]))
|
||||
|
||||
(defn reps
|
||||
(defn- reps
|
||||
"'Read eval print string', or 'read eval print single'.
|
||||
Reads and evaluates one input string, and returns the
|
||||
output string."
|
||||
|
|
@ -130,6 +130,7 @@
|
|||
actual (reps input)]
|
||||
(is (= actual expected))))))
|
||||
|
||||
|
||||
(deftest MEMBER-tests
|
||||
(testing "member"
|
||||
(let [expected "T"
|
||||
|
|
@ -146,18 +147,17 @@
|
|||
(is (= actual expected)))))
|
||||
|
||||
;; This is failing, and although yes, it does matter, I have not yet tracked the reason.
|
||||
(deftest sublis-tests
|
||||
(testing "sublis"
|
||||
(let [expected "(SHAKESPEARE WROTE (THE TEMPEST))"
|
||||
actual (reps
|
||||
"(SUBLIS
|
||||
'((X . SHAKESPEARE) (Y . (THE TEMPEST)))
|
||||
'(X WROTE Y))")]
|
||||
(is (= actual expected)))))
|
||||
;; (deftest sublis-tests
|
||||
;; (testing "sublis"
|
||||
;; (let [expected "(SHAKESPEARE WROTE (THE TEMPEST))"
|
||||
;; actual (reps
|
||||
;; "(SUBLIS
|
||||
;; '((X . SHAKESPEARE) (Y . (THE TEMPEST)))
|
||||
;; '(X WROTE Y))")]
|
||||
;; (is (= actual expected)))))
|
||||
|
||||
(deftest prog-tests
|
||||
(testing "PROG"
|
||||
;; (reps "(TRACE 'PROG)")
|
||||
(let [expected "5"
|
||||
actual (reps "(PROG (X)
|
||||
(SETQ X 1)
|
||||
|
|
@ -166,60 +166,3 @@
|
|||
(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.")))))
|
||||
|
||||
(deftest fsubr-tests
|
||||
(testing "FSUBR/CONC"
|
||||
(reps "(SETQ P (RANGE 1 4))")
|
||||
(reps "(SETQ Q (RANGE 5 8))")
|
||||
(reps "(SETQ R (RANGE 9 12))")
|
||||
(let [expected "(1 2 3 4 5 6 7 8 9 10 11 12)"
|
||||
actual (reps "(CONC P Q R)")]
|
||||
(is (= actual expected)))))
|
||||
|
||||
(deftest attrib-tests
|
||||
(testing "ATTRIB"
|
||||
(reps "(SETQ X '(A B C))")
|
||||
(reps "(SETQ Y '(D E F))")
|
||||
(let [expected "(D E F)"
|
||||
actual (reps "(ATTRIB X Y)")]
|
||||
(is (= actual expected)))
|
||||
(let [expected "(A B C D E F)"
|
||||
actual (reps "X")]
|
||||
(is (= actual expected)))))
|
||||
Loading…
Reference in a new issue