[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 09/16] qapi/expr.py: rewrite check_if
From: |
John Snow |
Subject: |
[PATCH 09/16] qapi/expr.py: rewrite check_if |
Date: |
Tue, 22 Sep 2020 17:13:06 -0400 |
This is a only minor rewrite to address some minor style nits. Don't
compare against the empty list to check for the empty condition, and
move the normalization forward to unify the check on the now-normalized
structure.
Signed-off-by: John Snow <jsnow@redhat.com>
---
scripts/qapi/expr.py | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/scripts/qapi/expr.py b/scripts/qapi/expr.py
index 6b064a2138..5d5c3d050d 100644
--- a/scripts/qapi/expr.py
+++ b/scripts/qapi/expr.py
@@ -136,15 +136,15 @@ def check_if_str(ifcond: object) -> None:
ifcond = expr.get('if')
if ifcond is None:
return
- if isinstance(ifcond, list):
- if ifcond == []:
- raise QAPISemError(
- info, "'if' condition [] of %s is useless" % source)
- for elt in ifcond:
- check_if_str(elt)
- else:
- check_if_str(ifcond)
- expr['if'] = [ifcond]
+
+ if not isinstance(ifcond, list):
+ ifcond = [ifcond]
+ expr['if'] = ifcond
+ if not ifcond:
+ raise QAPISemError(
+ info, "'if' condition [] of %s is useless" % source)
+ for elt in ifcond:
+ check_if_str(elt)
def normalize_members(members: object) -> None:
--
2.26.2
- [PATCH 06/16] qapi/expr.py: Check type of 'data' member, (continued)
- [PATCH 06/16] qapi/expr.py: Check type of 'data' member, John Snow, 2020/09/22
- [PATCH 07/16] qapi/expr.py: Add casts in a few select cases, John Snow, 2020/09/22
- [PATCH 08/16] qapi/expr.py: add type hint annotations, John Snow, 2020/09/22
- [PATCH 09/16] qapi/expr.py: rewrite check_if,
John Snow <=
- [PATCH 10/16] qapi/expr.py: Remove single-letter variable, John Snow, 2020/09/22
- [PATCH 11/16] qapi/expr.py: enable pylint checks, John Snow, 2020/09/22
- [PATCH 12/16] qapi/expr.py: Add docstrings, John Snow, 2020/09/22