[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 09/16] qapi/expr.py: rewrite check_if
From: |
John Snow |
Subject: |
[PATCH v2 09/16] qapi/expr.py: rewrite check_if |
Date: |
Mon, 26 Oct 2020 17:36:30 -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>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Cleber Rosa <crosa@redhat.com>
Tested-by: Cleber Rosa <crosa@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 b393ccd30e92..4d4ee3daa002 100644
--- a/scripts/qapi/expr.py
+++ b/scripts/qapi/expr.py
@@ -143,15 +143,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 v2 00/16] qapi: static typing conversion, pt3, John Snow, 2020/10/26
- [PATCH v2 02/16] qapi/expr.py: Check for dict instead of OrderedDict, John Snow, 2020/10/26
- [PATCH v2 03/16] qapi/expr.py: constrain incoming expression types, John Snow, 2020/10/26
- [PATCH v2 04/16] qapi/expr.py: Add assertion for union type 'check_dict', John Snow, 2020/10/26
- [PATCH v2 05/16] qapi/expr.py: move string check upwards in check_type, John Snow, 2020/10/26
- [PATCH v2 06/16] qapi/expr.py: Check type of 'data' member, John Snow, 2020/10/26
- [PATCH v2 01/16] qapi/expr.py: Remove 'info' argument from nested check_if_str, John Snow, 2020/10/26
- [PATCH v2 07/16] qapi/expr.py: Add casts in a few select cases, John Snow, 2020/10/26
- [PATCH v2 08/16] qapi/expr.py: add type hint annotations, John Snow, 2020/10/26
- [PATCH v2 09/16] qapi/expr.py: rewrite check_if,
John Snow <=
- [PATCH v2 15/16] qapi/expr.py: move related checks inside check_xxx functions, John Snow, 2020/10/26
- [PATCH v2 10/16] qapi/expr.py: Remove single-letter variable, John Snow, 2020/10/26
- [PATCH v2 11/16] qapi/expr.py: enable pylint checks, John Snow, 2020/10/26
- [PATCH v2 12/16] qapi/expr.py: Add docstrings, John Snow, 2020/10/26
- [PATCH v2 13/16] qapi/expr.py: Modify check_keys to accept any Iterable, John Snow, 2020/10/26
- [PATCH v2 14/16] qapi/expr.py: Use tuples instead of lists for static data, John Snow, 2020/10/26
- [PATCH v2 16/16] qapi/expr.py: Use an expression checker dispatch table, John Snow, 2020/10/26