Skip to content

Commit d7e1778

Browse files
committed
doc
1 parent d28b2e4 commit d7e1778

6 files changed

Lines changed: 70 additions & 68 deletions

File tree

README

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,8 @@ IS automatically captures values of arguments
7777
to functions like 1+ in the above example. Values of other
7878
interesting subforms can be explicitly captured. IS supports capturing multiple values and can
7979
be taught how to deal with macros. The combination of these
80-
features allows MATCH-VALUES to be implementable as tiny extension:
80+
features allows MATCH-VALUES to be implementable as a tiny
81+
extension:
8182

8283
(is (match-values (values (1+ 5) "sdf")
8384
(= * 0)
@@ -116,9 +117,9 @@ a test and run it:
116117
..
117118
==> #<TRIAL (SHOULD-WORK) EXPECTED-SUCCESS 0.000s ⋅1>
118119

119-
Try is driven by conditions, and the comments to the right give the
120-
type of the condition that is printed on that line. The ⋅
121-
character marks successes.
120+
Try is driven by conditions, and the comments to the right show the
121+
type of the condition printed on that line. The ⋅ character marks
122+
successes.
122123

123124
We could have run our test with (TRY 'SHOULD-WORK) as well, which
124125
does pretty much the same thing except that it defaults to never
@@ -409,8 +410,8 @@ It is assumed that the Lisp is running under
409410

410411
Use mgl-try-rerun and mgl-try-rerun-all to rerun trials. They
411412
are especially convenient to rerun TRY:!, when deciding to inspect
412-
the results in a Try buffer for trial that may not have been run via
413-
Emacs.
413+
the results in a Try buffer for a trial that may not have been run
414+
via Emacs.
414415

415416
In an Emacs Try buffer, the following key bindings are available.
416417

@@ -445,8 +446,8 @@ In an Emacs Try buffer, the following key bindings are available.
445446
the test is called implicitly.
446447

447448
- R is like r, but *TRY-RERUN* and TRY:*RERUN* are set to
448-
T, so all tests are rerun. With a prefix argument, the test is
449-
called implicitly.
449+
T, to ensure that all tests are rerun. With a prefix argument,
450+
the test is called implicitly.
450451

451452
- Visiting source locations:
452453

@@ -523,29 +524,29 @@ disjoint subclasses:
523524
### Concrete Events
524525

525526
The non-abstract condition classes of events that are actually
526-
signalled are called concrete.
527+
signalled are called concrete.
527528

528529
Checks' RESULTs and Trials' VERDICTs have six concrete subclasses
529-
each:
530+
each:
530531

531532
- EXPECTED-RESULT-SUCCESS, UNEXPECTED-RESULT-SUCCESS,
532-
EXPECTED-RESULT-FAILURE, UNEXPECTED-RESULT-FAILURE,
533-
RESULT-SKIP, RESULT-ABORT*
533+
EXPECTED-RESULT-FAILURE, UNEXPECTED-RESULT-FAILURE,
534+
RESULT-SKIP, RESULT-ABORT*
534535

535536
- EXPECTED-VERDICT-SUCCESS, UNEXPECTED-VERDICT-SUCCESS,
536-
EXPECTED-VERDICT-FAILURE, UNEXPECTED-VERDICT-FAILURE,
537-
VERDICT-SKIP, VERDICT-ABORT*
537+
EXPECTED-VERDICT-FAILURE, UNEXPECTED-VERDICT-FAILURE,
538+
VERDICT-SKIP, VERDICT-ABORT*
538539

539540
Breaking the symmetry between Checks and Trials, TRIAL-START is a
540-
concrete event class, that marks the start of a TRIAL.
541+
concrete event class, that marks the start of a TRIAL.
541542

542543
ERROR* is an abstract class with two concrete subclasses:
543544

544545
- UNHANDLED-ERROR, signalled when a CL:ERROR reaches the handler set
545-
up by DEFTEST or WITH-TEST, or when the debugger is invoked.
546+
up by DEFTEST or WITH-TEST, or when the debugger is invoked.
546547

547548
- NLX, signalled when no error was detected by the handler, but the
548-
trial finishes with a non-local exit.
549+
trial finishes with a non-local exit.
549550

550551
These are the 15 concrete event classes.
551552

@@ -858,7 +859,7 @@ effect, then RESULT-SKIP is signalled.
858859
The result is signalled with the function SIGNAL if it is a PASS,
859860
else it's signalled with ERROR. This distinction matters
860861
only if the event is not handled, which is never the case in a
861-
TRIAL. Standalone checks though – those not enclosed by a trial –
862+
TRIAL. However, standalone checks – those not enclosed by a trial –
862863
invoke the debugger on RESULTs which are not of type PASS.
863864

864865
The signalled RESULT is not final until RECORD-EVENT is invoked on
@@ -2622,9 +2623,9 @@ setups.
26222623
==> #<TRIAL (WITH-TEST (TIMED)) ABORT* 0.300s ⊟1 ⋅2>
26232624

26242625
Timing is available for all OUTCOMEs (i.e. for Checks and TRIALs).
2625-
Checks generally measure the time spent during evaluation the form
2626-
they are wrapping. Trials measure the time between TRIAL-START and
2627-
the VERDICT.
2626+
Checks generally measure the time spent during evaluation of the
2627+
form they are wrapping. Trials measure the time between TRIAL-START
2628+
and the VERDICT.
26282629

26292630
Timing information is not available for TRIAL-START and ERROR*
26302631
events.
@@ -2937,11 +2938,11 @@ SBCL.
29372938
- Gray streams are broken on ABCL so the output may look even worse
29382939
[https://abcl.org/trac/ticket/373](https://abcl.org/trac/ticket/373).
29392940

2940-
- ABCL, CMUCL, and ECL have a bug related to losing
2941+
- ABCL, CMUCL and ECL have a bug related to losing
29412942
EQLness of source literals
2942-
<https://gitlab.com/embeddable-common-lisp/ecl/-/issues/665>.
2943-
The result is somewhat cosmetic; it may cause multiple captures
2944-
being made for the same thing.
2943+
<https://gitlab.com/embeddable-common-lisp/ecl/-/issues/665>. The
2944+
result is somewhat cosmetic; it may cause multiple captures being
2945+
made for the same thing.
29452946

29462947
## Glossary
29472948

README.md

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,8 @@ Note the `#N#` syntax due to [`*PRINT-CIRCLE*`][c8cb].
123123
to functions like [`1+`][1eb3] in the above example. Values of other
124124
interesting subforms can be [explicitly captured][20d8]. `IS` supports capturing multiple values and can
125125
be taught [how to deal with macros][0743]. The combination of these
126-
features allows [`MATCH-VALUES`][162a] to be implementable as tiny extension:
126+
features allows [`MATCH-VALUES`][162a] to be implementable as a tiny
127+
extension:
127128

128129
```common-lisp
129130
(is (match-values (values (1+ 5) "sdf")
@@ -166,9 +167,9 @@ a test and run it:
166167
==> #<TRIAL (SHOULD-WORK) EXPECTED-SUCCESS 0.000s ⋅1>
167168
```
168169

169-
Try is driven by conditions, and the comments to the right give the
170-
type of the condition that is printed on that line. The ``
171-
character marks successes.
170+
Try is driven by conditions, and the comments to the right show the
171+
type of the condition printed on that line. The `` character marks
172+
successes.
172173

173174
We could have run our test with `(TRY 'SHOULD-WORK)` as well, which
174175
does pretty much the same thing except that it defaults to never
@@ -487,8 +488,8 @@ It is assumed that the Lisp is running under
487488

488489
Use `mgl-try-rerun` and `mgl-try-rerun-all` to rerun trials. They
489490
are especially convenient to rerun [`TRY:!`][92af], when deciding to inspect
490-
the results in a Try buffer for trial that may not have been run via
491-
Emacs.
491+
the results in a Try buffer for a trial that may not have been run
492+
via Emacs.
492493

493494
In an Emacs Try buffer, the following key bindings are available.
494495

@@ -523,8 +524,8 @@ In an Emacs Try buffer, the following key bindings are available.
523524
the test is called implicitly.
524525

525526
- `R` is like `r`, but [`*TRY-RERUN*`][01e7] and [`TRY:*RERUN*`][63db] are set to
526-
`T`, so all tests are rerun. With a prefix argument, the test is
527-
called implicitly.
527+
`T`, to ensure that all tests are rerun. With a prefix argument,
528+
the test is called implicitly.
528529

529530
- Visiting source locations:
530531

@@ -619,29 +620,29 @@ disjoint subclasses:
619620
### 4.2 Concrete Events
620621

621622
The non-abstract condition classes of events that are actually
622-
signalled are called concrete.
623+
signalled are called concrete.
623624

624625
[Checks][bb56]' [`RESULT`][231f]s and [Trials][e6be]' [`VERDICT`][52e1]s have six concrete subclasses
625-
each:
626+
each:
626627

627628
- [`EXPECTED-RESULT-SUCCESS`][609c7], [`UNEXPECTED-RESULT-SUCCESS`][b72c],
628-
[`EXPECTED-RESULT-FAILURE`][d619], [`UNEXPECTED-RESULT-FAILURE`][daeb],
629-
[`RESULT-SKIP`][7c3f], [`RESULT-ABORT*`][ffab]
629+
[`EXPECTED-RESULT-FAILURE`][d619], [`UNEXPECTED-RESULT-FAILURE`][daeb],
630+
[`RESULT-SKIP`][7c3f], [`RESULT-ABORT*`][ffab]
630631

631632
- [`EXPECTED-VERDICT-SUCCESS`][06c2], [`UNEXPECTED-VERDICT-SUCCESS`][062e],
632-
[`EXPECTED-VERDICT-FAILURE`][30c9], [`UNEXPECTED-VERDICT-FAILURE`][fdf4],
633-
[`VERDICT-SKIP`][5786], [`VERDICT-ABORT*`][4805]
633+
[`EXPECTED-VERDICT-FAILURE`][30c9], [`UNEXPECTED-VERDICT-FAILURE`][fdf4],
634+
[`VERDICT-SKIP`][5786], [`VERDICT-ABORT*`][4805]
634635

635636
Breaking the symmetry between [Checks][bb56] and [Trials][e6be], [`TRIAL-START`][b664] is a
636-
concrete event class, that marks the start of a [`TRIAL`][99d0].
637+
concrete event class, that marks the start of a [`TRIAL`][99d0].
637638

638639
[`ERROR*`][0321] is an abstract class with two concrete subclasses:
639640

640641
- [`UNHANDLED-ERROR`][8f78], signalled when a `CL:ERROR`([`0`][d162] [`1`][35ba]) reaches the handler set
641-
up by [`DEFTEST`][e7ca] or [`WITH-TEST`][8f5d], or when the debugger is invoked.
642+
up by [`DEFTEST`][e7ca] or [`WITH-TEST`][8f5d], or when the debugger is invoked.
642643

643644
- [`NLX`][b115], signalled when no error was detected by the handler, but the
644-
trial finishes with a [non-local exit][b815].
645+
trial finishes with a [non-local exit][b815].
645646

646647
These are the 15 concrete event classes.
647648

@@ -1056,7 +1057,7 @@ effect, then [`RESULT-SKIP`][7c3f] is signalled.
10561057
The result is signalled with the function [`SIGNAL`][8f49] if it is a [`PASS`][21d9],
10571058
else it's signalled with [`ERROR`][35ba]. This distinction matters
10581059
only if the event is not handled, which is never the case in a
1059-
[`TRIAL`][99d0]. Standalone checks though – those not enclosed by a trial –
1060+
[`TRIAL`][99d0]. However, standalone checks – those not enclosed by a trial –
10601061
invoke the debugger on `RESULT`s which are not of type [`PASS`][21d9].
10611062
10621063
The signalled `RESULT` is not final until [`RECORD-EVENT`][ce49] is invoked on
@@ -3216,9 +3217,9 @@ setups.
32163217
```
32173218
32183219
Timing is available for all [`OUTCOME`][2656]s (i.e. for [Checks][bb56] and [`TRIAL`][99d0]s).
3219-
Checks generally measure the time spent during evaluation the form
3220-
they are wrapping. Trials measure the time between [`TRIAL-START`][b664] and
3221-
the [`VERDICT`][52e1].
3220+
Checks generally measure the time spent during evaluation of the
3221+
form they are wrapping. Trials measure the time between [`TRIAL-START`][b664]
3222+
and the [`VERDICT`][52e1].
32223223
32233224
Timing information is not available for `TRIAL-START` and [`ERROR*`][0321]
32243225
events.
@@ -3570,11 +3571,11 @@ SBCL.
35703571
- Gray streams are broken on ABCL so the output may look even worse
35713572
[https://abcl.org/trac/ticket/373](https://abcl.org/trac/ticket/373).
35723573
3573-
- ABCL, CMUCL, and ECL have a bug related to losing
3574+
- ABCL, CMUCL and ECL have a bug related to losing
35743575
[`EQL`][db03]ness of source literals
3575-
<https://gitlab.com/embeddable-common-lisp/ecl/-/issues/665>.
3576-
The result is somewhat cosmetic; it may cause multiple captures
3577-
being made for the same thing.
3576+
<https://gitlab.com/embeddable-common-lisp/ecl/-/issues/665>. The
3577+
result is somewhat cosmetic; it may cause multiple captures being
3578+
made for the same thing.
35783579
35793580
35803581
<a id="x-28TRY-3A-40GLOSSARY-20MGL-PAX-3ASECTION-29"></a>

src/events.lisp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,7 @@
7373
- NLX, signalled when no error was detected by the handler, but the
7474
trial finishes with a [non-local exit][clhs].
7575
76-
These are the 15 concrete event classes.
77-
"""
76+
These are the 15 concrete event classes."""
7877
(concrete-events-of-type function))
7978

8079
(defvar *concrete-events*

src/manual.lisp

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,8 @@
6262
[@EXPLICIT-CAPTURES]. IS supports capturing multiple values and can
6363
be taught [how to deal with macros]
6464
[@WRITING-AUTOMATIC-CAPTURE-RULES]. The combination of these
65-
features allows MATCH-VALUES to be implementable as tiny extension:
65+
features allows MATCH-VALUES to be implementable as a tiny
66+
extension:
6667
6768
```cl-transcript (:dynenv try-transcript)
6869
(is (match-values (values (1+ 5) "sdf")
@@ -105,9 +106,9 @@
105106
==> #<TRIAL (SHOULD-WORK) EXPECTED-SUCCESS 0.000s ⋅1>
106107
```
107108
108-
Try is driven by conditions, and the comments to the right give the
109-
type of the condition that is printed on that line. The `⋅`
110-
character marks successes.
109+
Try is driven by conditions, and the comments to the right show the
110+
type of the condition printed on that line. The `⋅` character marks
111+
successes.
111112
112113
We could have run our test with `(TRY 'SHOULD-WORK)` as well, which
113114
does pretty much the same thing except that it defaults to never
@@ -373,8 +374,8 @@
373374
374375
Use `mgl-try-rerun` and `mgl-try-rerun-all` to rerun trials. They
375376
are especially convenient to rerun TRY:!, when deciding to inspect
376-
the results in a Try buffer for trial that may not have been run via
377-
Emacs.
377+
the results in a Try buffer for a trial that may not have been run
378+
via Emacs.
378379
379380
In an Emacs Try buffer, the following key bindings are available.
380381
@@ -409,8 +410,8 @@
409410
the test is called implicitly.
410411
411412
- `\\R` is like `r`, but *TRY-RERUN* and TRY:*RERUN* are set to
412-
T, so all tests are rerun. With a prefix argument, the test is
413-
called implicitly.
413+
T, to ensure that all tests are rerun. With a prefix argument,
414+
the test is called implicitly.
414415
415416
- Visiting source locations:
416417
@@ -500,11 +501,11 @@
500501
- Gray streams are broken on ABCL so the output may look even worse
501502
[https://abcl.org/trac/ticket/373](https://abcl.org/trac/ticket/373).
502503
503-
- ABCL, CMUCL, and ECL have a bug related to losing
504+
- ABCL, CMUCL and ECL have a bug related to losing
504505
[EQL][function]ness of source literals
505-
<https://gitlab.com/embeddable-common-lisp/ecl/-/issues/665>.
506-
The result is somewhat cosmetic; it may cause multiple captures
507-
being made for the same thing.
506+
<https://gitlab.com/embeddable-common-lisp/ecl/-/issues/665>. The
507+
result is somewhat cosmetic; it may cause multiple captures being
508+
made for the same thing.
508509
""")
509510

510511

src/outcome.lisp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@
301301
The result is signalled with the function SIGNAL if it is a PASS,
302302
else it's signalled with [ERROR][function]. This distinction matters
303303
only if the event is not handled, which is never the case in a
304-
TRIAL. Standalone checks though – those not enclosed by a trial –
304+
TRIAL. However, standalone checks – those not enclosed by a trial –
305305
invoke the debugger on RESULTs which are not of type PASS.
306306
307307
The signalled RESULT is not final until RECORD-EVENT is invoked on

src/print.lisp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -283,9 +283,9 @@
283283
```
284284
285285
Timing is available for all OUTCOMEs (i.e. for @CHECKS and TRIALs).
286-
Checks generally measure the time spent during evaluation the form
287-
they are wrapping. Trials measure the time between TRIAL-START and
288-
the VERDICT.
286+
Checks generally measure the time spent during evaluation of the
287+
form they are wrapping. Trials measure the time between TRIAL-START
288+
and the VERDICT.
289289
290290
Timing information is not available for TRIAL-START and ERROR*
291291
events.""")

0 commit comments

Comments
 (0)