Skip to content

Commit 8a88acd

Browse files
committed
Merging branch/2023-01-13/rst-check for GitHub pull request 112 <#112>
2 parents 40f2312 + 7c6b6aa commit 8a88acd

File tree

12 files changed

+123
-19
lines changed

12 files changed

+123
-19
lines changed

.github/workflows/rst-check.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# .github/workflows/rst-check.yml -- check syntax of reStructuredText files
2+
#
3+
# This is a GitHub CI workflow
4+
# <https://docs.github.com/en/actions/using-workflows/about-workflows>
5+
# to check the syntax of reStructuredText files.
6+
7+
name: reStructuredText syntax check
8+
9+
on:
10+
# Run as part of CI checks on branch push and on merged pull request.
11+
- push
12+
- pull_request
13+
- workflow_dispatch # allow manual triggering
14+
15+
jobs:
16+
check-rst:
17+
runs-on: ubuntu-latest
18+
steps:
19+
- uses: actions/checkout@v3
20+
- name: Install docutils
21+
run: sudo apt-get install -y docutils
22+
- name: Check reStructuredText syntax
23+
run: tool/check-rst

design/arena.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ that the private representation can share a common prefix with
293293
private representation whether such an object is allocated or not,
294294
without requiring an extra field.
295295

296-
_`.tract.field.base`: The seg field is a pointer to the segment
296+
_`.tract.field.seg`: The seg field is a pointer to the segment
297297
containing the tract, or ``NULL`` if the tract is not contained in any
298298
segment.
299299

design/config.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ predefined when compiling the module sources::
169169

170170
CONFIG_VAR_<variety-code>
171171

172-
_`.var`: The variety codes are as follows:
172+
_`.var.codes`: The variety codes are as follows:
173173

174174
_`.var.hot`: ``HOT``
175175

design/poolamc.txt

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,21 @@ AMC pool class
1414
single: pool class; AMC design
1515

1616

17-
Introduction
18-
~~~~~~~~~~~~
17+
Guide Introduction
18+
~~~~~~~~~~~~~~~~~~
19+
20+
.. The intro and readership tags were found to be duplicated by
21+
changelist 182116 / commit e9841d23a but not referenced. But that
22+
was just a consequence of two documents being smushed together by
23+
RHSK in changelist 168424 / commit b0433b3e9: a guide and a design.
24+
It would be good to sort that out. See also
25+
<https://github.com/Ravenbrook/mps/issues/128>. RB 2023-01-14
1926
20-
_`.intro`: This document contains a guide (`.guide`_) to the MPS AMC
27+
_`.guide.intro`: This document contains a guide (`.guide`_) to the MPS AMC
2128
pool class, followed by the historical initial design
2229
(`.initial-design`_).
2330

24-
_`.readership`: Any MPS developer.
31+
_`.guide.readership`: Any MPS developer.
2532

2633

2734
Guide

design/poolawl.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ segment sizes are rounded up to the arena grain size.
246246

247247
_`.fun.awlsegcreate.where`: The segment is allocated using a
248248
generation preference, using the generation number stored in the
249-
``AWLStruct`` (the ``gen`` field), see `.poolstruct.gen`_ above.
249+
``AWLStruct`` (the ``gen`` field), see `.poolstruct`_ above.
250250

251251
``Res awlSegInit(Seg seg, Pool pool, Addr base, Size size, ArgList args)``
252252

design/prmc.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ design.mps.check_.
105105

106106
``Res MutatorContextInitFault(MutatorContext context, ...)``
107107

108-
_`.if.init.thread`: Initialize with the context of the mutator at the
108+
_`.if.init.fault`: Initialize with the context of the mutator at the
109109
point where it was stopped by a protection fault. The arguments are
110110
platform-specific and the return may be ``void`` instead of ``Res`` if
111111
this always succeeds.

design/protix.txt

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -88,12 +88,9 @@ okay), the protection is set to ``PROT_READ|PROT_WRITE|PROT_EXEC``.
8888
.. _design.mps.prot.if.set: prot#.if.set
8989

9090
_`.fun.set.assume.mprotect`: We assume that the call to ``mprotect()``
91-
always succeeds.
92-
93-
_`.fun.set.assume.mprotect`: This is because we should always call the
94-
function with valid arguments (aligned, references to mapped pages,
95-
and with an access that is compatible with the access of the
96-
underlying object).
91+
always succeeds. We should always call the function with valid
92+
arguments (aligned, references to mapped pages, and with an access
93+
that is compatible with the access of the underlying object).
9794

9895
_`.fun.sync`: ``ProtSync()`` does nothing in this implementation as
9996
``ProtSet()`` sets the protection without any delay.

design/protocol.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -569,7 +569,7 @@ following:
569569
A function called by ``SomeClassGet()``. All the class
570570
initialization code is actually in this function.
571571

572-
_`.impl.subclass`: The subclass test `.if.subclass`_ is implemented
572+
_`.impl.subclass`: The subclass test `.if.is-subclass`_ is implemented
573573
using an array of superclasses [Cohen_1991]_ giving a fast
574574
constant-time test. (RB_ tried an approach using prime factors
575575
[Gibbs_2004]_ but found that they overflowed in 32-bits too easily to

design/shield.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ _`.proof.sync`: As the depth of a segment cannot be negative
257257
| ⇒ all segments are synced (by `.inv.unsynced.depth`_)
258258
259259
_`.proof.access`: If the mutator is running then all segments must be
260-
synced (`.inv.unsynced.suspend`_). Which means that the hardware
260+
synced (`.inv.unsynced.suspended`_). Which means that the hardware
261261
protection (protection mode) must reflect the software protection
262262
(shield mode). Hence all shielded memory will be hardware protected
263263
while the mutator is running. This ensures `.prop.mutator.access`_.

design/tests.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@ _`.run`: Run these commands::
3232

3333
where ``<makefile>`` is the appropriate makefile for the platform (see
3434
`manual/build.txt`_), ``<variety>`` is the variety (see
35-
design.mps.config.var_) and ``<target>`` is the collection of tests
35+
design.mps.config.var.codes_) and ``<target>`` is the collection of tests
3636
(see `.target`_ below). For example::
3737

3838
make -f lii6ll VARIETY=cool testrun
3939

4040
If ``<variety>`` is omitted, tests are run in both the cool and hot
4141
varieties.
4242

43-
.. _design.mps.config.var: config#.var
43+
.. _design.mps.config.var.codes: config#.var.codes
4444
.. _manual/build.txt: https://www.ravenbrook.com/project/mps/master/manual/build.txt
4545

4646

0 commit comments

Comments
 (0)