[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 06/17] qapi: Simplify code a bit after previous commits
From: |
Markus Armbruster |
Subject: |
[PULL 06/17] qapi: Simplify code a bit after previous commits |
Date: |
Wed, 26 Apr 2023 07:57:33 +0200 |
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20230316071325.492471-7-armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
[Commit message corrected]
---
scripts/qapi/expr.py | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/scripts/qapi/expr.py b/scripts/qapi/expr.py
index 5abeaa19dd..8a8de9e3aa 100644
--- a/scripts/qapi/expr.py
+++ b/scripts/qapi/expr.py
@@ -335,21 +335,13 @@ def normalize_members(members: object) -> None:
def check_type_name(value: Optional[object],
info: QAPISourceInfo, source: str) -> None:
- if value is None:
- return
-
- if isinstance(value, str):
- return
-
- raise QAPISemError(info, "%s should be a type name" % source)
+ if value is not None and not isinstance(value, str):
+ raise QAPISemError(info, "%s should be a type name" % source)
def check_type_name_or_array(value: Optional[object],
info: QAPISourceInfo, source: str) -> None:
- if value is None:
- return
-
- if isinstance(value, str):
+ if value is None or isinstance(value, str):
return
if isinstance(value, list):
--
2.39.2
- [PULL 00/17] QAPI patches patches for 2023-04-26, Markus Armbruster, 2023/04/26
- [PULL 03/17] qapi: Clean up after removal of simple unions, Markus Armbruster, 2023/04/26
- [PULL 02/17] qapi/schema: Use super(), Markus Armbruster, 2023/04/26
- [PULL 08/17] qapi: Fix to reject 'data': 'mumble' in struct, Markus Armbruster, 2023/04/26
- [PULL 01/17] qapi: Fix error message format regression, Markus Armbruster, 2023/04/26
- [PULL 13/17] qapi: Fix code generated for optional conditional struct member, Markus Armbruster, 2023/04/26
- [PULL 16/17] qapi: Improve specificity of type/member descriptions, Markus Armbruster, 2023/04/26
- [PULL 14/17] qapi: Require boxed for conditional command and event arguments, Markus Armbruster, 2023/04/26
- [PULL 07/17] qapi: Fix error message when type name or array is expected, Markus Armbruster, 2023/04/26
- [PULL 11/17] tests/qapi-schema: Clean up positive test for conditionals, Markus Armbruster, 2023/04/26
- [PULL 06/17] qapi: Simplify code a bit after previous commits,
Markus Armbruster <=
- [PULL 04/17] qapi: Split up check_type(), Markus Armbruster, 2023/04/26
- [PULL 15/17] qapi: support updating expected test output via make, Markus Armbruster, 2023/04/26
- [PULL 05/17] qapi: Improve error message for unexpected array types, Markus Armbruster, 2023/04/26
- [PULL 12/17] tests/qapi-schema: Cover optional conditional struct member, Markus Armbruster, 2023/04/26
- [PULL 10/17] tests/qapi-schema: Rename a few conditionals, Markus Armbruster, 2023/04/26
- [PULL 09/17] tests/qapi-schema: Improve union discriminator coverage, Markus Armbruster, 2023/04/26
- [PULL 17/17] qapi: allow unions to contain further unions, Markus Armbruster, 2023/04/26
- Re: [PULL 00/17] QAPI patches patches for 2023-04-26, Richard Henderson, 2023/04/26