qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Richard Henderson <richard.henderson@linaro.org>
To: Peter Maydell <peter.maydell@linaro.org>, qemu-devel@nongnu.org
Cc: "John Snow" <jsnow@redhat.com>,
	"Daniel P. Berrangé" <berrange@redhat.com>,
	"Markus Armbruster" <armbru@redhat.com>,
	"Stefan Hajnoczi" <stefanha@redhat.com>,
	"Michael Roth" <mdroth@linux.vnet.ibm.com>
Subject: Re: [PATCH v3 05/12] scripts/qapi/parser.py: improve doc comment indent handling
Date: Thu, 27 Feb 2020 06:13:27 -0800	[thread overview]
Message-ID: <376f873c-34da-30a1-3239-128d3f164a31@linaro.org> (raw)
In-Reply-To: <20200225140437.20609-6-peter.maydell@linaro.org>

On 2/25/20 6:04 AM, Peter Maydell wrote:
> Make the handling of indentation in doc comments more sophisticated,
> so that when we see a section like:
> 
> Notes: some text
>        some more text
>           indented line 3
> 
> we save it for the doc-comment processing code as:
> 
> some text
> some more text
>    indented line 3
> 
> and when we see a section with the heading on its own line:
> 
> Notes:
> 
> some text
> some more text
>    indented text
> 
> we also accept that and save it in the same form.
> 
> The exception is that we always retain indentation as-is for Examples
> sections, because these are literal text.
> 
> If we detect that the comment document text is not indented as much
> as we expect it to be, we throw a parse error.  (We don't complain
> about over-indented sections, because for rST this can be legitimate
> markup.)
> 
> The golden reference for the doc comment text is updated to remove
> the two 'wrong' indents; these now form a test case that we correctly
> stripped leading whitespace from an indented multi-line argument
> definition.
> 
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---
> v1->v2: Update doc-good.out as per final para.
> ---
>  scripts/qapi/parser.py         | 82 +++++++++++++++++++++++++++-------
>  tests/qapi-schema/doc-good.out |  4 +-
>  2 files changed, 67 insertions(+), 19 deletions(-)

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>


r~


  reply	other threads:[~2020-02-27 14:16 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-02-25 14:04 [PATCH v3 00/12] Convert QAPI doc comments to generate rST instead of texinfo Peter Maydell
2020-02-25 14:04 ` [PATCH v3 01/12] qapi/qapi-schema.json: Put headers in their own doc-comment blocks Peter Maydell
2020-02-27 13:53   ` Richard Henderson
2020-02-25 14:04 ` [PATCH v3 02/12] qapi/machine.json: Escape a literal '*' in doc comment Peter Maydell
2020-02-27 13:56   ` Richard Henderson
2020-02-25 14:04 ` [PATCH v3 03/12] tests/qapi/doc-good.json: Clean up markup Peter Maydell
2020-02-27 13:58   ` Richard Henderson
2020-02-25 14:04 ` [PATCH v3 04/12] scripts/qapi: Move doc-comment whitespace stripping to doc.py Peter Maydell
2020-02-27 13:59   ` Richard Henderson
2020-02-25 14:04 ` [PATCH v3 05/12] scripts/qapi/parser.py: improve doc comment indent handling Peter Maydell
2020-02-27 14:13   ` Richard Henderson [this message]
2020-02-25 14:04 ` [PATCH v3 06/12] docs/sphinx: Add new qapi-doc Sphinx extension Peter Maydell
2020-02-25 14:04 ` [PATCH v3 07/12] docs/interop: Convert qemu-ga-ref to rST Peter Maydell
2020-02-25 14:04 ` [PATCH v3 08/12] docs/interop: Convert qemu-qmp-ref " Peter Maydell
2020-02-25 14:04 ` [PATCH v3 09/12] qapi: Use rST markup for literal blocks Peter Maydell
2020-02-25 14:04 ` [PATCH v3 10/12] qga/qapi-schema.json: Add some headings Peter Maydell
2020-02-25 14:04 ` [PATCH v3 11/12] scripts/qapi: Remove texinfo generation support Peter Maydell
2020-02-25 14:04 ` [PATCH v3 12/12] docs/devel/qapi-code-gen.txt: Update to new rST backend conventions Peter Maydell
2020-02-26 11:45 ` [PATCH v3 00/12] Convert QAPI doc comments to generate rST instead of texinfo Markus Armbruster
2020-03-06 17:30 ` Peter Maydell

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=376f873c-34da-30a1-3239-128d3f164a31@linaro.org \
    --to=richard.henderson@linaro.org \
    --cc=armbru@redhat.com \
    --cc=berrange@redhat.com \
    --cc=jsnow@redhat.com \
    --cc=mdroth@linux.vnet.ibm.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@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).