Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .readthedocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ python:

sphinx:
configuration: manual/source/conf.py
fail_on_warning: true

# A. REFERENCES
#
Expand Down
4 changes: 0 additions & 4 deletions design/object-debug.txt
Original file line number Diff line number Diff line change
Expand Up @@ -347,10 +347,6 @@ _`.interface.tags.alloc`: Two functions to extend the existing
_`.interface.tags.walker.type`: Type of walker function for
``mps_pool_walk()`` and ``mps_arena_walk()``.

``void mps_pool_walk(mps_arena_t arena, mps_pool_t pool, mps_objects_step_t step, void *p)``

``void mps_arena_walk(mps_arena_t arena, mps_objects_step_t step, void *p)``

_`.interface.tags.walker`: Functions to walk all the allocated
objects in an arena (only client pools in this case),
``format`` and ``tag_data`` can be ``NULL`` (``tag_data`` really wants
Expand Down
4 changes: 2 additions & 2 deletions manual/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

# You can set these variables from the command line.
PYTHON = python3
SPHINXOPTS =
SPHINXOPTS = -T -W --keep-going
SPHINXBUILD = tool/bin/sphinx-build
PAPER =
BUILDDIR = .
Expand Down Expand Up @@ -44,7 +44,7 @@ help:
@echo " tools to install a local copy of the Python tools using virtualenv"

clean:
-rm -rf $(BUILDDIR)/{changes,devhelp,dirhtml,doctest,doctrees,epub,html,htmlhelp,json,latex,linkcheck,locale,man,pickle,qthelp,singlehtml,texinfo,text}
-for dir in changes devhelp dirhtml doctest doctrees epub html htmlhelp json latex linkcheck locale man pickle qthelp singlehtml texinfo text; do rm -rf $(BUILDDIR)/$$dir; done
-find $(BUILDDIR)/source/design -name '*.rst' ! -name 'index.rst' ! -name 'old.rst' -exec rm -f '{}' ';'

html: $(SPHINXBUILD)
Expand Down
9 changes: 8 additions & 1 deletion manual/build.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
.. mode: -*- rst -*-

===============================
.. NOTE: This file is a chapter of the MPS manual, and so uses some
Sphinx markup. It does double-duty as plain text / GitHub rendered
instructions for bootstrapping the manual. When editing, be
careful to ensure that the manual builds correctly. See GitHub
issue #158 <https://github.com/Ravenbrook/mps/issues/158>.

.. _guide-build:

Building the Memory Pool System
===============================

Expand Down
9 changes: 5 additions & 4 deletions manual/source/extensions/mps/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'''
Sphinx extensions for the MPS documentation.
See <http://sphinx-doc.org/extensions.html>
See <https://www.sphinx-doc.org/en/master/development/index.html>
'''

from collections import defaultdict
Expand Down Expand Up @@ -56,12 +56,13 @@ def add_to_app(cls, app):
else:
return
if hasattr(cls, 'node_class') and hasattr(cls, 'visit'):
app.add_node(cls.node_class, html=cls.visit, latex=cls.visit,
app.add_node(cls.node_class, override=True,
html=cls.visit, latex=cls.visit,
text=cls.visit, man=cls.visit)
if hasattr(cls, 'domain'):
app.add_directive_to_domain(cls.domain, name, cls)
app.add_directive_to_domain(cls.domain, name, cls, override=True)
else:
app.add_directive(name, cls)
app.add_directive(name, cls, override=True)

class MpsPrefixDirective(MpsDirective):
domain = 'mps'
Expand Down
2 changes: 0 additions & 2 deletions manual/source/guide/build.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,4 @@
single: compiling
single: installing

.. _guide-build:

.. include:: ../../build.txt
2 changes: 1 addition & 1 deletion manual/source/topic/scanning.rst
Original file line number Diff line number Diff line change
Expand Up @@ -557,7 +557,7 @@ the scanners, found in ``scan.c`` in the MPS source code.
.. note::

The reason that :c:data:`base` and :c:data:`limit` have type
:c:type:`void *` and not :c:type:`mps_addr_t` is that the
``void *`` and not :c:type:`mps_addr_t` is that the
latter is used only for :term:`addresses` managed by the MPS,
but :c:type:`mps_area_scan_t` may also be used to scan
:term:`roots` that are not managed by the MPS.
Expand Down