[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 04/12] qapi/gen: assert that _start_if is not None in _wrap_if
From: |
John Snow |
Subject: |
[PATCH v2 04/12] qapi/gen: assert that _start_if is not None in _wrap_ifcond |
Date: |
Wed, 16 Dec 2020 20:59:19 -0500 |
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],
--
2.26.2
- [PATCH v2 00/12] qapi: static typing conversion, pt1.5, John Snow, 2020/12/16
- [PATCH v2 01/12] qapi/commands: assert arg_type is not None, John Snow, 2020/12/16
- [PATCH v2 02/12] qapi/events: fix visit_event typing, John Snow, 2020/12/16
- [PATCH v2 03/12] qapi/main: handle theoretical None-return from re.match(), John Snow, 2020/12/16
- [PATCH v2 10/12] tests/qapi-schema: Add quotes to module name in test output, John Snow, 2020/12/16
- [PATCH v2 04/12] qapi/gen: assert that _start_if is not None in _wrap_ifcond,
John Snow <=
- [PATCH v2 08/12] qapi/gen: write _genc/_genh access shims, John Snow, 2020/12/16
- [PATCH v2 12/12] qapi: enable strict-optional checks, John Snow, 2020/12/16
- [PATCH v2 07/12] qapi/schema: make QAPISourceInfo mandatory, John Snow, 2020/12/16
- [PATCH v2 05/12] qapi/gen: use './builtin' for the built-in module name, John Snow, 2020/12/16
- [PATCH v2 09/12] qapi/gen: move write method to QAPIGenC, make fname a str, John Snow, 2020/12/16
- [PATCH v2 06/12] qapi/source: Add builtin null-object sentinel, John Snow, 2020/12/16
- [PATCH v2 11/12] qapi/schema: Name the builtin module "" instead of None, John Snow, 2020/12/16