Re: [PATCH 19/29] qapi/qapi-schema.json: Put headers in their own doc-comment blocks

[Markus Armbruster]

Peter Maydell <address@hidden> writes:

> Our current QAPI doc-comment markup allows section headers
> (introduced with a leading '=' or '==') anywhere in any documentation
> comment.  This works for texinfo because the texi generator simply
> prints a texinfo heading directive at that point in the output
> stream.  For rST generation, since we're assembling a tree of
> docutils nodes, this is awkward because a new section implies
> starting a new section node at the top level of the tree and
> generating text into there.
>
> New section headings in the middle of the documentation of a command
> or event would be pretty nonsensical, and in fact we only ever output
> new headings using 'freeform' doc comment blocks whose only content
> is the single line of the heading, with two exceptions, which are in
> the introductory freeform-doc-block at the top of
> qapi/qapi-schema.json.
>
> Split that doc-comment up so that the heading lines are in their own
> doc-comment.  This will allow us to tighten the specification to
> insist that heading lines are always standalone, rather than
> requiring the rST document generator to look at every line in a doc
> comment block and handle headings in odd places.
>
> This change makes no difference to the generated texi.
>
> Signed-off-by: Peter Maydell <address@hidden>
> ---
>  qapi/qapi-schema.json | 12 +++++++++---
>  1 file changed, 9 insertions(+), 3 deletions(-)
>
> diff --git a/qapi/qapi-schema.json b/qapi/qapi-schema.json
> index 9751b11f8f1..f7ba60a5d0b 100644
> --- a/qapi/qapi-schema.json
> +++ b/qapi/qapi-schema.json
> @@ -1,7 +1,9 @@
>  # -*- Mode: Python -*-
>  ##
>  # = Introduction
> -#
> +##
> +
> +##
>  # This document describes all commands currently supported by QMP.
>  #
>  # Most of the time their usage is exactly the same as in the user Monitor, 
> this
> @@ -25,9 +27,13 @@
>  #
>  # Please, refer to the QMP specification (docs/interop/qmp-spec.txt) for
>  # detailed information on the Server command and response formats.
> -#
> +##
> +
> +##
>  # = Stability Considerations
> -#
> +##
> +
> +##
>  # The current QMP command set (described in this file) may be useful for a
>  # number of use cases, however it's limited and several commands have bad
>  # defined semantics, specially with regard to command completion.

I figure this is a minimally invasive patch to avoid complications in
your rST generator.  I'm afraid it sweeps the actual problem under the
rug, namely flaws in our parsing and representation of doc comments.

The doc comment parser doesn't recognize headings.  Instead, that's done
somewhere in the bowels of the Texinfo generator.  Works as long as the
input is "sane", happily generates invalid Texinfo otherwise, see
tests/qapi-schema/doc-bad-section.json.

The proper fix is to make the parser recognize headers in the places
where headers make sense, and reject them elsewhere.

But maybe we don't have to.  Do you plan to support full rST in doc
comments?  If yes, why have our own syntax for headings?  Why not leave
it to rST?  If no, do you plan to support a subset of rST?  If yes,
define it, please.  How will it be enforced?