[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 04/16] qapi/gen: inline _wrap_ifcond into end_if()
From: |
John Snow |
Subject: |
[PATCH v4 04/16] qapi/gen: inline _wrap_ifcond into end_if() |
Date: |
Mon, 1 Feb 2021 14:37:35 -0500 |
We assert _start_if is not None in end_if, but that's opaque to mypy.
By inlining _wrap_ifcond, that constraint becomes provable to mypy.
Signed-off-by: John Snow <jsnow@redhat.com>
---
scripts/qapi/gen.py | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/scripts/qapi/gen.py b/scripts/qapi/gen.py
index b40f18eee3c..3d81b90ab71 100644
--- a/scripts/qapi/gen.py
+++ b/scripts/qapi/gen.py
@@ -130,15 +130,12 @@ 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 is not None
self._body = _wrap_ifcond(self._start_if[0],
self._start_if[1], self._body)
self._preamble = _wrap_ifcond(self._start_if[0],
self._start_if[2], self._preamble)
+ self._start_if = None
def get_content(self) -> str:
assert self._start_if is None
--
2.29.2
- [PATCH v4 00/16] qapi: static typing conversion, pt1.5, John Snow, 2021/02/01
- [PATCH v4 04/16] qapi/gen: inline _wrap_ifcond into end_if(),
John Snow <=
- [PATCH v4 03/16] qapi/main: handle theoretical None-return from re.match(), John Snow, 2021/02/01
- [PATCH v4 02/16] qapi/events: fix visit_event typing, John Snow, 2021/02/01
- [PATCH v4 01/16] qapi/commands: assert arg_type is not None, John Snow, 2021/02/01
- [PATCH v4 06/16] qapi/gen: Replace ._begin_system_module(), John Snow, 2021/02/01
- [PATCH v4 07/16] qapi: use explicitly internal module names, John Snow, 2021/02/01
- [PATCH v4 10/16] qapi: centralize the built-in module name definition, John Snow, 2021/02/01
- [PATCH v4 09/16] qapi/gen: Combine ._add_[user|system]_module, John Snow, 2021/02/01