From: John Snow <jsnow@redhat.com>
To: Markus Armbruster <armbru@redhat.com>
Cc: "Michael Roth" <michael.roth@amd.com>,
"Cleber Rosa" <crosa@redhat.com>,
qemu-devel@nongnu.org,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Eduardo Habkost" <ehabkost@redhat.com>
Subject: Re: [PATCH v2 04/12] qapi/gen: assert that _start_if is not None in _wrap_ifcond
Date: Wed, 13 Jan 2021 16:34:51 -0500 [thread overview]
Message-ID: <1803a765-a9e2-339c-035e-a0326167a80f@redhat.com> (raw)
In-Reply-To: <87im80yill.fsf@dusky.pond.sub.org>
On 1/13/21 10:14 AM, Markus Armbruster wrote:
> John Snow <jsnow@redhat.com> writes:
>
>> We already assert this in end_if, but that's opaque to mypy. Do it in
>> _wrap_ifcond instead. Same effect at runtime, but mypy can now infer
>> the type in _wrap_ifcond's body.
>>
>> Signed-off-by: John Snow <jsnow@redhat.com>
>> ---
>> scripts/qapi/gen.py | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/scripts/qapi/gen.py b/scripts/qapi/gen.py
>> index b40f18eee3c..a6dc991b1d0 100644
>> --- a/scripts/qapi/gen.py
>> +++ b/scripts/qapi/gen.py
>> @@ -130,11 +130,11 @@ def start_if(self, ifcond: List[str]) -> None:
>> self._start_if = (ifcond, self._body, self._preamble)
>>
>> def end_if(self) -> None:
>> - assert self._start_if
>> self._wrap_ifcond()
>> self._start_if = None
>>
>> def _wrap_ifcond(self) -> None:
>> + assert self._start_if
>> self._body = _wrap_ifcond(self._start_if[0],
>> self._start_if[1], self._body)
>> self._preamble = _wrap_ifcond(self._start_if[0],
>
> Let's inline ._wrap_ifcond() into .end_if(). Not a blocker, of course.
>
I thought I did do this, but I guess it didn't make it out to list. I'll
look into that.
I was planning on taking your series and trying to splice it into this
one here and sending it back out as a conjoined thing.
next prev parent reply other threads:[~2021-01-13 21:36 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-17 1:59 [PATCH v2 00/12] qapi: static typing conversion, pt1.5 John Snow
2020-12-17 1:59 ` [PATCH v2 01/12] qapi/commands: assert arg_type is not None John Snow
2020-12-17 1:59 ` [PATCH v2 02/12] qapi/events: fix visit_event typing John Snow
2020-12-17 1:59 ` [PATCH v2 03/12] qapi/main: handle theoretical None-return from re.match() John Snow
2020-12-17 1:59 ` [PATCH v2 04/12] qapi/gen: assert that _start_if is not None in _wrap_ifcond John Snow
2021-01-13 15:14 ` Markus Armbruster
2021-01-13 21:34 ` John Snow [this message]
2020-12-17 1:59 ` [PATCH v2 05/12] qapi/gen: use './builtin' for the built-in module name John Snow
2020-12-17 1:59 ` [PATCH v2 06/12] qapi/source: Add builtin null-object sentinel John Snow
2021-01-13 15:39 ` Markus Armbruster
2021-01-13 22:30 ` John Snow
2021-01-14 13:39 ` Markus Armbruster
2021-01-18 18:36 ` Eduardo Habkost
2021-01-19 10:21 ` Markus Armbruster
2021-01-19 16:10 ` Eduardo Habkost
2020-12-17 1:59 ` [PATCH v2 07/12] qapi/schema: make QAPISourceInfo mandatory John Snow
2021-01-13 16:12 ` Markus Armbruster
2021-01-13 23:04 ` John Snow
2021-01-14 0:29 ` Eduardo Habkost
2021-01-14 0:47 ` John Snow
2020-12-17 1:59 ` [PATCH v2 08/12] qapi/gen: write _genc/_genh access shims John Snow
2020-12-17 1:59 ` [PATCH v2 09/12] qapi/gen: move write method to QAPIGenC, make fname a str John Snow
2020-12-17 1:59 ` [PATCH v2 10/12] tests/qapi-schema: Add quotes to module name in test output John Snow
2020-12-17 1:59 ` [PATCH v2 11/12] qapi/schema: Name the builtin module "" instead of None John Snow
2020-12-17 1:59 ` [PATCH v2 12/12] qapi: enable strict-optional checks John Snow
2021-01-13 16:23 ` [PATCH v2 00/12] qapi: static typing conversion, pt1.5 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=1803a765-a9e2-339c-035e-a0326167a80f@redhat.com \
--to=jsnow@redhat.com \
--cc=armbru@redhat.com \
--cc=crosa@redhat.com \
--cc=ehabkost@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=michael.roth@amd.com \
--cc=qemu-devel@nongnu.org \
/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).