[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 01/16] qapi/commands: assert arg_type is not None
From: |
John Snow |
Subject: |
[PATCH v4 01/16] qapi/commands: assert arg_type is not None |
Date: |
Mon, 1 Feb 2021 14:37:32 -0500 |
When boxed is True, expr.py asserts that we must have
arguments. Ultimately, this should mean that if boxed is True that
arg_type should be defined. Mypy cannot infer this, and does not support
'stateful' type inference, e.g.:
```
if x:
assert y is not None
...
if x:
y.etc()
```
does not work, because mypy does not statefully remember the conditional
assertion in the second block. Help mypy out by creating a new local
that it can track more easily.
Signed-off-by: John Snow <jsnow@redhat.com>
---
scripts/qapi/commands.py | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/scripts/qapi/commands.py b/scripts/qapi/commands.py
index 50978090b44..71744f48a35 100644
--- a/scripts/qapi/commands.py
+++ b/scripts/qapi/commands.py
@@ -126,6 +126,9 @@ def gen_marshal(name: str,
boxed: bool,
ret_type: Optional[QAPISchemaType]) -> str:
have_args = boxed or (arg_type and not arg_type.is_empty())
+ if have_args:
+ assert arg_type is not None
+ arg_type_c_name = arg_type.c_name()
ret = mcgen('''
@@ -147,7 +150,7 @@ def gen_marshal(name: str,
ret += mcgen('''
%(c_name)s arg = {0};
''',
- c_name=arg_type.c_name())
+ c_name=arg_type_c_name)
ret += mcgen('''
@@ -163,7 +166,7 @@ def gen_marshal(name: str,
ok = visit_check_struct(v, errp);
}
''',
- c_arg_type=arg_type.c_name())
+ c_arg_type=arg_type_c_name)
else:
ret += mcgen('''
ok = visit_check_struct(v, errp);
@@ -193,7 +196,7 @@ def gen_marshal(name: str,
ret += mcgen('''
visit_type_%(c_arg_type)s_members(v, &arg, NULL);
''',
- c_arg_type=arg_type.c_name())
+ c_arg_type=arg_type_c_name)
ret += mcgen('''
visit_end_struct(v, NULL);
--
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, 2021/02/01
- [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 <=
- [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
- [PATCH v4 12/16] qapi/gen: Support for switching to another module temporarily, John Snow, 2021/02/01
- [PATCH v4 11/16] qapi/gen: write _genc/_genh access shims, John Snow, 2021/02/01
- [PATCH v4 13/16] qapi/commands: Simplify command registry generation, John Snow, 2021/02/01