From: John Snow <jsnow@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Markus Armbruster" <armbru@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Michael Roth" <michael.roth@amd.com>,
"Daniel P. Berrangé" <berrange@redhat.com>,
"Eric Blake" <eblake@redhat.com>,
"Thomas Huth" <thuth@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Peter Maydell" <peter.maydell@linaro.org>,
"John Snow" <jsnow@redhat.com>
Subject: [PATCH v2 39/62] docs/qapidoc: add transmogrifier class stub
Date: Sun, 9 Mar 2025 04:35:26 -0400 [thread overview]
Message-ID: <20250309083550.5155-40-jsnow@redhat.com> (raw)
In-Reply-To: <20250309083550.5155-1-jsnow@redhat.com>
Add the beginnings of the Transmogrifier class by adding the rST
conversion helpers that will be used to build the virtual rST document.
This version of the class does not actually "do anything" yet; each
individual feature is added one-at-a-time in the forthcoming commits.
Signed-off-by: John Snow <jsnow@redhat.com>
---
docs/sphinx/qapidoc.py | 73 ++++++++++++++++++++++++++++++++++++++++--
1 file changed, 70 insertions(+), 3 deletions(-)
diff --git a/docs/sphinx/qapidoc.py b/docs/sphinx/qapidoc.py
index 5246832b68c..c243bb6faaa 100644
--- a/docs/sphinx/qapidoc.py
+++ b/docs/sphinx/qapidoc.py
@@ -26,14 +26,17 @@
from __future__ import annotations
+from contextlib import contextmanager
import os
import sys
from typing import TYPE_CHECKING
from docutils import nodes
from docutils.parsers.rst import Directive, directives
+from docutils.statemachine import StringList
from qapi.error import QAPIError
from qapi.schema import QAPISchema, QAPISchemaVisitor
+from qapi.source import QAPISourceInfo
from qapidoc_legacy import QAPISchemaGenRSTVisitor # type: ignore
from sphinx import addnodes
@@ -44,9 +47,12 @@
if TYPE_CHECKING:
- from typing import Any, List, Sequence
-
- from docutils.statemachine import StringList
+ from typing import (
+ Any,
+ Generator,
+ List,
+ Sequence,
+ )
from sphinx.application import Sphinx
from sphinx.util.typing import ExtensionMetadata
@@ -55,6 +61,67 @@
__version__ = "1.0"
+class Transmogrifier:
+ def __init__(self) -> None:
+ self._result = StringList()
+ self.indent = 0
+
+ # General-purpose rST generation functions
+
+ def get_indent(self) -> str:
+ return " " * self.indent
+
+ @contextmanager
+ def indented(self) -> Generator[None]:
+ self.indent += 1
+ try:
+ yield
+ finally:
+ self.indent -= 1
+
+ def add_line_raw(self, line: str, source: str, *lineno: int) -> None:
+ """Append one line of generated reST to the output."""
+
+ # NB: Sphinx uses zero-indexed lines; subtract one.
+ lineno = tuple((n - 1 for n in lineno))
+
+ if line.strip():
+ # not a blank line
+ self._result.append(
+ self.get_indent() + line.rstrip("\n"), source, *lineno
+ )
+ else:
+ self._result.append("", source, *lineno)
+
+ def add_line(self, content: str, info: QAPISourceInfo) -> None:
+ # NB: We *require* an info object; this works out OK because we
+ # don't document built-in objects that don't have
+ # one. Everything else should.
+ self.add_line_raw(content, info.fname, info.line)
+
+ def add_lines(
+ self,
+ content: str,
+ info: QAPISourceInfo,
+ ) -> None:
+ lines = content.splitlines(True)
+ for i, line in enumerate(lines):
+ self.add_line_raw(line, info.fname, info.line + i)
+
+ def ensure_blank_line(self) -> None:
+ # Empty document -- no blank line required.
+ if not self._result:
+ return
+
+ # Last line isn't blank, add one.
+ if self._result[-1].strip(): # pylint: disable=no-member
+ fname, line = self._result.info(-1)
+ assert isinstance(line, int)
+ # New blank line is credited to one-after the current last line.
+ # +2: correct for zero/one index, then increment by one.
+ self.add_line_raw("", fname, line + 2)
+
+
class QAPISchemaGenDepVisitor(QAPISchemaVisitor):
"""A QAPI schema visitor which adds Sphinx dependencies each module
--
2.48.1
next prev parent reply other threads:[~2025-03-09 8:41 UTC|newest]
Thread overview: 100+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-09 8:34 [PATCH v2 00/62] docs: Add new QAPI transmogrifier John Snow
2025-03-09 8:34 ` [PATCH v2 01/62] do-not-merge John Snow
2025-03-09 8:34 ` [PATCH v2 02/62] qapi: shush pylint up John Snow
2025-03-09 19:41 ` Markus Armbruster
2025-03-09 8:34 ` [PATCH v2 03/62] docs/sphinx: create QAPI domain extension stub John Snow
2025-03-09 8:34 ` [PATCH v2 04/62] docs/sphinx: add compat.py module and nested_parse helper John Snow
2025-03-09 8:34 ` [PATCH v2 05/62] docs/qapi-domain: add QAPI domain object registry John Snow
2025-03-09 8:34 ` [PATCH v2 06/62] docs/qapi-domain: add QAPI index John Snow
2025-03-09 8:34 ` [PATCH v2 07/62] docs/qapi-domain: add resolve_any_xref() John Snow
2025-03-09 8:34 ` [PATCH v2 08/62] docs/qapi-domain: add QAPI xref roles John Snow
2025-03-09 8:34 ` [PATCH v2 09/62] docs/qapi-domain: add compatibility node classes John Snow
2025-03-09 8:34 ` [PATCH v2 10/62] docs/qapi-domain: Add ObjectDescription abstract class John Snow
2025-03-10 9:15 ` Markus Armbruster
2025-03-10 21:12 ` John Snow
2025-03-09 8:34 ` [PATCH v2 11/62] docs/qapi-domain: add qapi:module directive John Snow
2025-03-10 9:47 ` Markus Armbruster
2025-03-09 8:34 ` [PATCH v2 12/62] docs/qapi-domain: add QAPIObject class John Snow
2025-03-10 9:46 ` Markus Armbruster
2025-03-09 8:35 ` [PATCH v2 13/62] docs/qapi-domain: add qapi:command directive John Snow
2025-03-09 8:35 ` [PATCH v2 14/62] docs/qapi-domain: add :since: directive option John Snow
2025-03-09 8:35 ` [PATCH v2 15/62] docs/qapi-domain: add "Arguments:" field lists John Snow
2025-03-09 20:37 ` Markus Armbruster
2025-03-09 8:35 ` [PATCH v2 16/62] docs/qapi-domain: add "Features:" " John Snow
2025-03-09 20:42 ` Markus Armbruster
2025-03-09 8:35 ` [PATCH v2 17/62] docs/qapi-domain: add "Errors:" " John Snow
2025-03-09 8:35 ` [PATCH v2 18/62] docs/qapi-domain: add "Return:" " John Snow
2025-03-09 20:46 ` Markus Armbruster
2025-03-09 8:35 ` [PATCH v2 19/62] docs/qapi-domain: add qapi:enum directive John Snow
2025-03-09 8:35 ` [PATCH v2 20/62] docs/qapi-domain: add qapi:alternate directive John Snow
2025-03-09 8:35 ` [PATCH v2 21/62] docs/qapi-domain: add qapi:event directive John Snow
2025-03-09 8:35 ` [PATCH v2 22/62] docs/qapi-domain: add qapi:object directive John Snow
2025-03-09 8:35 ` [PATCH v2 23/62] docs/qapi-domain: add :deprecated: directive option John Snow
2025-03-09 20:51 ` Markus Armbruster
2025-03-09 8:35 ` [PATCH v2 24/62] docs/qapi-domain: add :unstable: " John Snow
2025-03-10 9:54 ` Markus Armbruster
2025-03-09 8:35 ` [PATCH v2 25/62] docs/qapi-domain: add :ifcond: " John Snow
2025-03-09 8:35 ` [PATCH v2 26/62] docs/qapi-domain: add warnings for malformed field lists John Snow
2025-03-09 8:35 ` [PATCH v2 27/62] docs/qapi-domain: add type cross-refs to " John Snow
2025-03-09 8:35 ` [PATCH v2 28/62] docs/qapi-domain: add CSS styling John Snow
2025-03-10 9:47 ` Markus Armbruster
2025-03-09 8:35 ` [PATCH v2 29/62] docs/qapi-domain: add XREF compatibility goop for Sphinx < 4.1 John Snow
2025-03-09 8:35 ` [PATCH v2 30/62] docs/qapi-domain: warn when QAPI domain xrefs fail to resolve John Snow
2025-03-09 8:35 ` [PATCH v2 31/62] docs/qapi-domain: Fix error context reporting in Sphinx 5.x and 6.x John Snow
2025-03-09 8:35 ` [PATCH v2 32/62] qapi/parser: adjust info location for doc body section John Snow
2025-03-09 20:53 ` Markus Armbruster
2025-03-09 8:35 ` [PATCH v2 33/62] qapi: expand tags to all doc sections John Snow
2025-03-09 20:57 ` Markus Armbruster
2025-03-10 11:44 ` Markus Armbruster
2025-03-09 8:35 ` [PATCH v2 34/62] qapi/schema: add __repr__ to QAPIDoc.Section John Snow
2025-03-09 8:35 ` [PATCH v2 35/62] docs/qapidoc: add transmogrifier stub John Snow
2025-03-09 8:35 ` [PATCH v2 36/62] docs/qapidoc: split old implementation into qapidoc_legacy.py John Snow
2025-03-09 8:35 ` [PATCH v2 37/62] docs/qapidoc: Fix static typing on qapidoc.py John Snow
2025-03-09 8:35 ` [PATCH v2 38/62] do-not-merge John Snow
2025-03-09 8:35 ` John Snow [this message]
2025-03-09 8:35 ` [PATCH v2 40/62] docs/qapidoc: add visit_module() method John Snow
2025-03-09 8:35 ` [PATCH v2 41/62] qapi/source: allow multi-line QAPISourceInfo advancing John Snow
2025-03-09 20:59 ` Markus Armbruster
2025-03-09 8:35 ` [PATCH v2 42/62] docs/qapidoc: add visit_freeform() method John Snow
2025-03-09 21:01 ` Markus Armbruster
2025-03-10 21:11 ` John Snow
2025-03-09 8:35 ` [PATCH v2 43/62] docs/qapidoc: add preamble() method John Snow
2025-03-09 21:03 ` Markus Armbruster
2025-03-10 21:05 ` John Snow
2025-03-10 21:06 ` John Snow
2025-03-10 9:46 ` Markus Armbruster
2025-03-10 11:24 ` Markus Armbruster
2025-03-09 8:35 ` [PATCH v2 44/62] docs/qapidoc: add visit_paragraph() method John Snow
2025-03-09 8:35 ` [PATCH v2 45/62] docs/qapidoc: add visit_errors() method John Snow
2025-03-09 21:05 ` Markus Armbruster
2025-03-10 21:17 ` John Snow
2025-03-11 6:08 ` Markus Armbruster
2025-03-09 8:35 ` [PATCH v2 46/62] docs/qapidoc: add format_type() method John Snow
2025-03-09 8:35 ` [PATCH v2 47/62] docs/qapidoc: add add_field() and generate_field() helper methods John Snow
2025-03-09 8:35 ` [PATCH v2 48/62] docs/qapidoc: add visit_feature() method John Snow
2025-03-09 21:06 ` Markus Armbruster
2025-03-09 8:35 ` [PATCH v2 49/62] docs/qapidoc: prepare to record entity being transmogrified John Snow
2025-03-09 8:35 ` [PATCH v2 50/62] docs/qapidoc: add visit_returns() method John Snow
2025-03-09 21:08 ` Markus Armbruster
2025-03-09 8:35 ` [PATCH v2 51/62] docs/qapidoc: add visit_member() method John Snow
2025-03-09 21:09 ` Markus Armbruster
2025-03-09 8:35 ` [PATCH v2 52/62] docs/qapidoc: add visit_sections() method John Snow
2025-03-09 21:10 ` Markus Armbruster
2025-03-09 8:35 ` [PATCH v2 53/62] docs/qapidoc: add visit_entity() John Snow
2025-03-09 8:35 ` [PATCH v2 54/62] docs/qapidoc: implement transmogrify() method John Snow
2025-03-10 12:42 ` Markus Armbruster
2025-03-09 8:35 ` [PATCH v2 55/62] docs/qapidoc: process @foo into ``foo`` John Snow
2025-03-09 8:35 ` [PATCH v2 56/62] docs/qapidoc: add intermediate output debugger John Snow
2025-03-09 21:17 ` Markus Armbruster
2025-03-10 21:26 ` John Snow
2025-03-09 8:35 ` [PATCH v2 57/62] docs/qapidoc: Add "the members of" pointers John Snow
2025-03-09 8:35 ` [PATCH v2 58/62] docs/qapidoc: generate entries for undocumented members John Snow
2025-03-10 10:08 ` Markus Armbruster
2025-03-09 8:35 ` [PATCH v2 59/62] qapi/parser: add undocumented stub members to all_sections John Snow
2025-03-10 10:19 ` Markus Armbruster
2025-03-09 8:35 ` [PATCH v2 60/62] docs: disambiguate cross-references John Snow
2025-03-09 8:35 ` [PATCH v2 61/62] docs: enable qapidoc transmogrifier for QEMU QMP Reference John Snow
2025-03-09 21:13 ` Markus Armbruster
2025-03-10 21:33 ` John Snow
2025-03-09 8:35 ` [PATCH v2 62/62] docs: add qapi-domain syntax documentation John Snow
2025-03-09 21:19 ` [PATCH v2 00/62] docs: Add new QAPI transmogrifier Markus Armbruster
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250309083550.5155-40-jsnow@redhat.com \
--to=jsnow@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=eblake@redhat.com \
--cc=michael.roth@amd.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).