From: John Snow <jsnow@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
"Thomas Huth" <thuth@redhat.com>,
"Yanan Wang" <wangyanan55@huawei.com>,
"Fabiano Rosas" <farosas@suse.de>,
"Zhao Liu" <zhao1.liu@intel.com>,
"Lukas Straub" <lukasstraub2@web.de>,
"Eduardo Habkost" <eduardo@habkost.net>,
"Michael Roth" <michael.roth@amd.com>,
"Daniel P. Berrangé" <berrange@redhat.com>,
"Peter Xu" <peterx@redhat.com>, "Eric Blake" <eblake@redhat.com>,
"Marcel Apfelbaum" <marcel.apfelbaum@gmail.com>,
"Markus Armbruster" <armbru@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Jason Wang" <jasowang@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"John Snow" <jsnow@redhat.com>
Subject: [PATCH 30/42] docs/qapidoc: add minimalistic inliner
Date: Wed, 5 Feb 2025 18:11:56 -0500 [thread overview]
Message-ID: <20250205231208.1480762-31-jsnow@redhat.com> (raw)
In-Reply-To: <20250205231208.1480762-1-jsnow@redhat.com>
Add a minimalistic inliner that only gets the basics - leaving branch
inlining for a future patch.
Signed-off-by: John Snow <jsnow@redhat.com>
---
docs/sphinx/qapidoc.py | 174 ++++++++++++++++++++++++++++++++++++++++-
1 file changed, 172 insertions(+), 2 deletions(-)
diff --git a/docs/sphinx/qapidoc.py b/docs/sphinx/qapidoc.py
index 154ebc1b4cd..538c26e812d 100644
--- a/docs/sphinx/qapidoc.py
+++ b/docs/sphinx/qapidoc.py
@@ -25,13 +25,15 @@
https://www.sphinx-doc.org/en/master/development/index.html
"""
+from collections import defaultdict
from contextlib import contextmanager
+import enum
import os
from pathlib import Path
import re
import sys
import textwrap
-from typing import List, Optional
+from typing import Dict, List, Optional
from docutils import nodes
from docutils.parsers.rst import Directive, directives
@@ -45,8 +47,10 @@
QAPISchemaCommand,
QAPISchemaEntity,
QAPISchemaEnumMember,
+ QAPISchemaEvent,
QAPISchemaFeature,
QAPISchemaMember,
+ QAPISchemaObjectType,
QAPISchemaObjectTypeMember,
)
from qapi.source import QAPISourceInfo
@@ -77,6 +81,172 @@ def dedent(text: str) -> str:
return lines[0] + textwrap.dedent("".join(lines[1:]))
+class DocRegion(enum.Enum):
+ # The inliner introduces the concept of doc Regions, which are
+ # groupings of zero or more Sections. These regions are used to know
+ # how to combine two lists of Sections.
+ INTRO = 0
+ MEMBER = 1
+ OTHER = 2
+ FEATURE = 3
+ DETAIL = 4
+
+ @staticmethod
+ def categorize(section: QAPIDoc.Section) -> "Optional[DocRegion]":
+ return MAPPING[section.kind]
+
+
+MAPPING = {
+ QAPIDoc.Kind.INTRO: DocRegion.INTRO,
+ QAPIDoc.Kind.MEMBER: DocRegion.MEMBER,
+ QAPIDoc.Kind.FEATURE: DocRegion.FEATURE,
+ QAPIDoc.Kind.RETURNS: DocRegion.OTHER,
+ QAPIDoc.Kind.ERRORS: DocRegion.OTHER,
+ QAPIDoc.Kind.SINCE: None,
+ QAPIDoc.Kind.TODO: None,
+ QAPIDoc.Kind.DETAIL: DocRegion.DETAIL,
+}
+
+
+class InlinerSections:
+
+ def __init__(self, sections):
+ self._sections: List[QAPIDoc.Section] = list(sections)
+ self.partitions: Dict[DocRegion, List[QAPIDoc.Section]] = defaultdict(
+ list
+ )
+ self._modified = False
+
+ self._partition()
+
+ def _partition(self):
+ for section in self._sections:
+ # suppress empty text sections for the purpose of, later,
+ # being able to determine if a collection of doc sections
+ # "has an intro" or "has a details section" or not, which is
+ # helpful later on for some assertions about the inliner.
+ if section.kind in (QAPIDoc.Kind.INTRO, QAPIDoc.Kind.DETAIL):
+ if not section.text:
+ continue
+
+ region = DocRegion.categorize(section)
+ if region is None:
+ continue
+
+ self.partitions[region].append(section)
+
+ def absorb(self, other: "InlinerSections"):
+ for category, oval in other.partitions.items():
+ val = self.partitions[category]
+ if category == DocRegion.INTRO:
+ # The intro region is not inlined, it is dropped.
+ continue
+
+ # Everything else is prepended.
+ self.partitions[category] = oval + val
+ if oval:
+ self._modified = True
+
+ def __iter__(self):
+ return iter(self._flatten())
+
+ def _flatten(self):
+ # Serialize back into a normal list.
+
+ # If nothing has changed, we don't need to do anything.
+ if not self._modified:
+ return tuple(self._sections)
+
+ # Otherwise, we need to rebuild the sequence.
+ #
+ # FIXME: This function assumes a stricter ordering of regions
+ # within the source docs (see DocRegion); This order is not
+ # currently enforced in parser.py, so this method may shift some
+ # contents around compared to the source.
+ tmp = []
+ for category in DocRegion:
+ tmp.extend(self.partitions[category])
+ self._sections = tmp
+ self._modified = False
+ return tuple(self._sections)
+
+
+def inline(ent: QAPISchemaEntity) -> List[QAPIDoc.Section]:
+ """
+ Return all of an entity's doc sections with inlined sections stitched in.
+
+ First, a given entity's sections are retrieved in full, in source order.
+
+ Next, if this entity has either an argument type (Commands and
+ Events) or an inherited base (Structs, Unions), this function is
+ called recursively on that type to retrieve its sections. These
+ sections are then stitched into the result.
+
+ Lastly, if this entity has any branches, this function is called
+ recursively on each branch type and those sections are stitched into
+ the result.
+
+ STITCH ORDER:
+
+ - Introduction
+ - [Inlined introduction sections are dropped.]
+ - Recursively inlined Members
+ - Members
+ - Recursively inlined Branch members
+ - Other special sections (Errors, Returns)
+ - [There are no cases where we have these sections to inline.]
+ - Recursively inlined Features
+ - Features
+ - Recursively inlined Details
+ - Details
+
+ Intro paragraphs are never stitched into the documentation section
+ list. Members, Features, and Details paragraphs are stitched in
+ *before* the given entity's equivalent regions. Individual sections
+ otherwise appear in source order as they do in the parent or child.
+
+ Branch members are stitched in *after* the member section.
+
+ In the event that a paragraph cannot be determined to be an intro or
+ details type, a warning is emitted. It will be treated as an intro
+ section and dropped from the output. QEMU usually treats Sphinx
+ warnings as fatal, so this warning is usually fatal.
+ """
+
+ def _sections(ent) -> List[QAPIDoc.Section]:
+ return ent.doc.all_sections if ent.doc else []
+
+ def _get_inline_target(
+ ent: QAPISchemaEntity,
+ ) -> Optional[QAPISchemaEntity]:
+ """Get the entity to inline from for a given entity."""
+ if isinstance(ent, (QAPISchemaCommand, QAPISchemaEvent)):
+ return ent.arg_type
+ if isinstance(ent, QAPISchemaObjectType):
+ return ent.base
+ return None
+
+ # Let's do this thing!
+
+ if ent is None:
+ return []
+
+ # Grab all directly documented sections for the entity in question.
+ sections = InlinerSections(_sections(ent))
+
+ # Get inlined sections: this includes everything from the
+ # inlined entity (and anything it inlines, too).
+ inlined = InlinerSections(inline(_get_inline_target(ent)))
+
+ # Now, stitch the results together!
+ sections.absorb(inlined)
+
+ # FIXME: Branches should be handled about here O:-)
+
+ # Return the combined list of sections.
+ return list(sections)
+
+
class Transmogrifier:
# Field names used for different entity types:
field_types = {
@@ -285,7 +455,7 @@ def preamble(self, ent: QAPISchemaEntity) -> None:
self.ensure_blank_line()
def visit_sections(self, ent: QAPISchemaEntity) -> None:
- sections = ent.doc.all_sections if ent.doc else []
+ sections = inline(ent)
# Add sections *in the order they are documented*:
for section in sections:
--
2.48.1
next prev parent reply other threads:[~2025-02-05 23:17 UTC|newest]
Thread overview: 67+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-05 23:11 [PATCH 00/42] docs: add sphinx-domain rST generator to qapidoc John Snow
2025-02-05 23:11 ` [PATCH 01/42] docs/qapidoc: support header-less freeform sections John Snow
2025-02-11 14:51 ` Markus Armbruster
2025-02-11 17:21 ` John Snow
2025-02-05 23:11 ` [PATCH 02/42] qapi/parser: adjust info location for doc body section John Snow
2025-02-05 23:11 ` [PATCH 03/42] docs/qapidoc: remove example section support John Snow
2025-02-05 23:11 ` [PATCH 04/42] qapi: expand tags to all doc sections John Snow
2025-02-05 23:11 ` [PATCH 05/42] qapi/schema: add __repr__ to QAPIDoc.Section John Snow
2025-02-05 23:11 ` [PATCH 06/42] docs/qapidoc: add transmogrifier stub John Snow
2025-02-05 23:11 ` [PATCH 07/42] docs/qapidoc: add transmogrifier class stub John Snow
2025-02-05 23:11 ` [PATCH 08/42] docs/qapidoc: add visit_module() method John Snow
2025-02-05 23:11 ` [PATCH 09/42] qapi/source: allow multi-line QAPISourceInfo advancing John Snow
2025-02-05 23:11 ` [PATCH 10/42] docs/qapidoc: add visit_freeform() method John Snow
2025-02-05 23:11 ` [PATCH 11/42] docs/qapidoc: add preamble() method John Snow
2025-02-05 23:11 ` [PATCH 12/42] docs/qapidoc: add visit_paragraph() method John Snow
2025-02-05 23:11 ` [PATCH 13/42] docs/qapidoc: add visit_errors() method John Snow
2025-02-05 23:11 ` [PATCH 14/42] docs/qapidoc: add format_type() method John Snow
2025-02-05 23:11 ` [PATCH 15/42] docs/qapidoc: add add_field() and generate_field() helper methods John Snow
2025-02-05 23:11 ` [PATCH 16/42] docs/qapidoc: add visit_feature() method John Snow
2025-02-05 23:11 ` [PATCH 17/42] docs/qapidoc: prepare to record entity being transmogrified John Snow
2025-02-05 23:11 ` [PATCH 18/42] docs/qapidoc: add visit_returns() method John Snow
2025-02-05 23:11 ` [PATCH 19/42] docs/qapidoc: add visit_member() method John Snow
2025-02-05 23:11 ` [PATCH 20/42] docs/qapidoc: add visit_sections() method John Snow
2025-02-05 23:11 ` [PATCH 21/42] docs/qapidoc: add visit_entity() John Snow
2025-02-05 23:11 ` [PATCH 22/42] docs/qapidoc: implement transmogrify() method John Snow
2025-02-05 23:11 ` [PATCH 23/42] docs: disambiguate cross-references John Snow
2025-02-05 23:11 ` [PATCH 24/42] docs/qapidoc: add transmogrifier test document John Snow
2025-02-05 23:11 ` [PATCH 25/42] docs/qapidoc: generate entries for undocumented members John Snow
2025-02-05 23:11 ` [PATCH 26/42] qapi/parser: add undocumented stub members to all_sections John Snow
2025-02-05 23:11 ` [PATCH 27/42] qapi: differentiate "intro" and "detail" sections John Snow
2025-02-11 15:00 ` Markus Armbruster
2025-02-18 20:30 ` John Snow
2025-02-05 23:11 ` [PATCH 28/42] qapi/parser: prohibit untagged sections between tagged sections John Snow
2025-02-12 9:06 ` Markus Armbruster
2025-02-18 21:36 ` John Snow
2025-02-19 7:58 ` Markus Armbruster
2025-02-17 11:53 ` Markus Armbruster
2025-02-05 23:11 ` [PATCH 29/42] qapi: Add "Details:" disambiguation marker John Snow
2025-02-12 9:37 ` Markus Armbruster
2025-02-18 22:22 ` John Snow
2025-02-17 10:51 ` Markus Armbruster
2025-02-18 22:23 ` John Snow
2025-02-17 11:55 ` Markus Armbruster
2025-02-18 22:26 ` John Snow
2025-02-19 9:04 ` Markus Armbruster
2025-02-17 12:13 ` Markus Armbruster
2025-02-18 22:48 ` John Snow
2025-02-19 12:49 ` Markus Armbruster
2025-02-05 23:11 ` John Snow [this message]
2025-02-05 23:11 ` [PATCH 31/42] docs/qapidoc: autogenerate undocumented return docs John Snow
2025-02-05 23:11 ` [PATCH 32/42] docs/qapidoc: Add generated returns documentation to inliner John Snow
2025-02-05 23:11 ` [PATCH 33/42] docs/qmp: add target to Out-of-band execution section John Snow
2025-02-05 23:12 ` [PATCH 34/42] docs/qapidoc: document the "out-of-band" pseudofeature John Snow
2025-02-05 23:12 ` [PATCH 35/42] docs/qapidoc: generate out-of-band pseudofeature sections John Snow
2025-02-05 23:12 ` [PATCH 36/42] qapi/parser: add "meta" kind to QAPIDoc.Kind John Snow
2025-02-05 23:12 ` [PATCH 37/42] qapi/schema: add __iter__ method to QAPISchemaVariants John Snow
2025-02-05 23:12 ` [PATCH 38/42] docs/qapi: add branch support to inliner John Snow
2025-02-05 23:12 ` [PATCH 39/42] qapi/schema: add doc_visible property to QAPISchemaDefinition John Snow
2025-02-05 23:12 ` [PATCH 40/42] docs/qapidoc: cull (most) un-named entities from docs John Snow
2025-02-05 23:12 ` [PATCH 41/42] qapi: resolve filenames in info structures John Snow
2025-02-05 23:12 ` [PATCH 42/42] docs/qapidoc: add intermediate output debugger John Snow
2025-02-14 12:05 ` [PATCH 00/42] docs: add sphinx-domain rST generator to qapidoc Markus Armbruster
2025-02-18 20:01 ` John Snow
2025-02-19 13:22 ` Markus Armbruster
2025-02-20 20:32 ` John Snow
2025-02-21 6:41 ` Markus Armbruster
2025-02-21 18:08 ` John Snow
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=20250205231208.1480762-31-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=eduardo@habkost.net \
--cc=farosas@suse.de \
--cc=jasowang@redhat.com \
--cc=lukasstraub2@web.de \
--cc=marcel.apfelbaum@gmail.com \
--cc=michael.roth@amd.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=peterx@redhat.com \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
--cc=wangyanan55@huawei.com \
--cc=zhao1.liu@intel.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).