[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 11/17] qapi/expr.py: Consolidate check_if_str calls in check_i
From: |
John Snow |
Subject: |
[PATCH v5 11/17] qapi/expr.py: Consolidate check_if_str calls in check_if |
Date: |
Wed, 21 Apr 2021 14:20:26 -0400 |
This is a small 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.
With the check unified, the local nested function isn't needed anymore
and can be brought down into the normal flow of the function. With the
nesting level changed, shuffle the error strings around a bit to get
them to fit in 79 columns.
Note: although ifcond is typed as Sequence[str] elsewhere, we *know* that
the parser will produce real, bona-fide lists. It's okay to check
isinstance(ifcond, list) here.
Signed-off-by: John Snow <jsnow@redhat.com>
---
scripts/qapi/expr.py | 33 ++++++++++++++++-----------------
1 file changed, 16 insertions(+), 17 deletions(-)
diff --git a/scripts/qapi/expr.py b/scripts/qapi/expr.py
index 4ebed4c4884..de7fc16fac2 100644
--- a/scripts/qapi/expr.py
+++ b/scripts/qapi/expr.py
@@ -146,30 +146,29 @@ def check_flags(expr: _JSONObject, info: QAPISourceInfo)
-> None:
def check_if(expr: _JSONObject, info: QAPISourceInfo, source: str) -> None:
- def check_if_str(ifcond: object) -> None:
- if not isinstance(ifcond, str):
- raise QAPISemError(
- info,
- "'if' condition of %s must be a string or a list of strings"
- % source)
- if ifcond.strip() == '':
- raise QAPISemError(
- info,
- "'if' condition '%s' of %s makes no sense"
- % (ifcond, source))
-
ifcond = expr.get('if')
if ifcond is None:
return
+
if isinstance(ifcond, list):
- if ifcond == []:
+ if not 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]
+ # Normalize to a list
+ ifcond = expr['if'] = [ifcond]
+
+ for elt in ifcond:
+ if not isinstance(elt, str):
+ raise QAPISemError(
+ info,
+ "'if' condition of %s must be a string or a list of strings"
+ % source)
+ if not elt.strip():
+ raise QAPISemError(
+ info,
+ "'if' condition '%s' of %s makes no sense"
+ % (elt, source))
def normalize_members(members: object) -> None:
--
2.30.2
- [PATCH v5 01/17] qapi/expr: Comment cleanup, (continued)
- [PATCH v5 01/17] qapi/expr: Comment cleanup, John Snow, 2021/04/21
- [PATCH v5 05/17] qapi/expr.py: Add assertion for union type 'check_dict', John Snow, 2021/04/21
- [PATCH v5 03/17] qapi/expr.py: Check for dict instead of OrderedDict, John Snow, 2021/04/21
- [PATCH v5 06/17] qapi/expr.py: move string check upwards in check_type, John Snow, 2021/04/21
- [PATCH v5 12/17] qapi/expr.py: Remove single-letter variable, John Snow, 2021/04/21
- [PATCH v5 10/17] qapi/expr.py: add type hint annotations, John Snow, 2021/04/21
- [PATCH v5 07/17] qapi/expr.py: Check type of union and alternate 'data' member, John Snow, 2021/04/21
- [PATCH v5 13/17] qapi/expr.py: enable pylint checks, John Snow, 2021/04/21
- [PATCH v5 09/17] qapi/expr.py: Modify check_keys to accept any Collection, John Snow, 2021/04/21
- [PATCH v5 04/17] qapi/expr.py: constrain incoming expression types, John Snow, 2021/04/21
- [PATCH v5 11/17] qapi/expr.py: Consolidate check_if_str calls in check_if,
John Snow <=
- [PATCH v5 16/17] qapi/expr.py: Use tuples instead of lists for static data, John Snow, 2021/04/21
- [PATCH v5 02/17] qapi/expr.py: Remove 'info' argument from nested check_if_str, John Snow, 2021/04/21
- [PATCH v5 08/17] qapi/expr.py: Add casts in a few select cases, John Snow, 2021/04/21
- [PATCH v5 15/17] qapi/expr.py: Add docstrings, John Snow, 2021/04/21
- [PATCH v5 17/17] qapi/expr: Update authorship and copyright information, John Snow, 2021/04/21
- [PATCH v5 14/17] qapi/expr: Only explicitly prohibit 'Kind' nor 'List' for type names, John Snow, 2021/04/21
- Re: [PATCH v5 00/17] qapi: static typing conversion, pt3, Markus Armbruster, 2021/04/22