[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 31/37] qapi: Normalize 'if' in check_exprs(), like other sugar
From: |
Markus Armbruster |
Subject: |
[PULL 31/37] qapi: Normalize 'if' in check_exprs(), like other sugar |
Date: |
Tue, 24 Sep 2019 14:33:28 +0200 |
We normalize shorthand to longhand forms in check_expr(): enumeration
values with normalize_enum(), feature values with
normalize_features(), struct members, union branches and alternate
branches with normalize_members(). If conditions are an exception: we
normalize them in QAPISchemaEntity.check() and
QAPISchemaMember.__init(), with listify_cond(). The idea goes back to
commit 2cbc94376e "qapi: pass 'if' condition into QAPISchemaEntity
objects", v3.0.0.
Normalize in check_expr() instead, with new helper normalize_if().
Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
scripts/qapi/common.py | 26 +++++++++++++++-----------
1 file changed, 15 insertions(+), 11 deletions(-)
diff --git a/scripts/qapi/common.py b/scripts/qapi/common.py
index cacee9b8bb..4d1f62e808 100644
--- a/scripts/qapi/common.py
+++ b/scripts/qapi/common.py
@@ -804,6 +804,7 @@ def check_type(info, source, value,
check_known_keys(info, "member '%s' of %s" % (key, source),
arg, ['type'], ['if'])
check_if(arg, info)
+ normalize_if(arg)
check_type(info, "Member '%s' of %s" % (key, source),
arg['type'], allow_array=True,
allow_metas=['built-in', 'union', 'alternate', 'struct',
@@ -904,6 +905,7 @@ def check_union(expr, info):
check_known_keys(info, "member '%s' of union '%s'" % (key, name),
value, ['type'], ['if'])
check_if(value, info)
+ normalize_if(value)
# Each value must name a known type
check_type(info, "Member '%s' of union '%s'" % (key, name),
value['type'],
@@ -933,6 +935,7 @@ def check_alternate(expr, info):
"member '%s' of alternate '%s'" % (key, name),
value, ['type'], ['if'])
check_if(value, info)
+ normalize_if(value)
typ = value['type']
# Ensure alternates have no type conflicts.
@@ -978,6 +981,7 @@ def check_enum(expr, info):
check_known_keys(info, "member of enum '%s'" % name, member,
['name'], ['if'])
check_if(member, info)
+ normalize_if(member)
check_name(info, "Member of enum '%s'" % name, member['name'],
enum_member=True)
@@ -1003,6 +1007,7 @@ def check_struct(expr, info):
['name'], ['if'])
check_if(f, info)
+ normalize_if(f)
check_name(info, "Feature of struct %s" % name, f['name'])
@@ -1067,6 +1072,12 @@ def normalize_features(features):
for f in features]
+def normalize_if(expr):
+ ifcond = expr.get('if')
+ if isinstance(ifcond, str):
+ expr['if'] = [ifcond]
+
+
def check_exprs(exprs):
global all_names
@@ -1123,6 +1134,7 @@ def check_exprs(exprs):
else:
raise QAPISemError(expr_elem['info'],
"Expression is missing metatype")
+ normalize_if(expr)
name = expr[meta]
add_name(name, info, meta)
if doc and doc.symbol != name:
@@ -1177,14 +1189,6 @@ def check_exprs(exprs):
# Schema compiler frontend
#
-def listify_cond(ifcond):
- if not ifcond:
- return []
- if not isinstance(ifcond, list):
- return [ifcond]
- return ifcond
-
-
class QAPISchemaEntity(object):
def __init__(self, name, info, doc, ifcond=None):
assert name is None or isinstance(name, str)
@@ -1197,7 +1201,7 @@ class QAPISchemaEntity(object):
# such place).
self.info = info
self.doc = doc
- self._ifcond = ifcond # self.ifcond is set only after .check()
+ self._ifcond = ifcond or []
def c_name(self):
return c_name(self.name)
@@ -1209,7 +1213,7 @@ class QAPISchemaEntity(object):
typ.check(schema)
self.ifcond = typ.ifcond
else:
- self.ifcond = listify_cond(self._ifcond)
+ self.ifcond = self._ifcond
if self.info:
self.module = os.path.relpath(self.info['file'],
os.path.dirname(schema.fname))
@@ -1515,7 +1519,7 @@ class QAPISchemaMember(object):
def __init__(self, name, ifcond=None):
assert isinstance(name, str)
self.name = name
- self.ifcond = listify_cond(ifcond)
+ self.ifcond = ifcond or []
self.owner = None
def set_owner(self, name):
--
2.21.0
- [PULL 12/37] qapi: Permit omitting all flat union branches, (continued)
- [PULL 12/37] qapi: Permit omitting all flat union branches, Markus Armbruster, 2019/09/24
- [PULL 15/37] docs/devel/qapi-code-gen: Rewrite compatibility considerations, Markus Armbruster, 2019/09/24
- [PULL 20/37] tests/qapi-schema: Delete two redundant tests, Markus Armbruster, 2019/09/24
- [PULL 24/37] tests/qapi-schema: Demonstrate suboptimal lexical errors, Markus Armbruster, 2019/09/24
- [PULL 09/37] qapi: Drop support for escape sequences other than \\, Markus Armbruster, 2019/09/24
- [PULL 21/37] tests/qapi-schema: Demonstrate misleading optional tag error, Markus Armbruster, 2019/09/24
- [PULL 16/37] docs/devel/qapi-code-gen: Rewrite introduction to schema, Markus Armbruster, 2019/09/24
- [PULL 18/37] qapi: Tweak code to match docs/devel/qapi-code-gen.txt, Markus Armbruster, 2019/09/24
- [PULL 25/37] qapi: Use quotes more consistently in frontend error messages, Markus Armbruster, 2019/09/24
- [PULL 17/37] docs/devel/qapi-code-gen: Improve QAPI schema language doc, Markus Armbruster, 2019/09/24
- [PULL 31/37] qapi: Normalize 'if' in check_exprs(), like other sugar,
Markus Armbruster <=
- [PULL 28/37] qapi: Fix broken discriminator error messages, Markus Armbruster, 2019/09/24
- [PULL 08/37] qapi: Restrict strings to printable ASCII, Markus Armbruster, 2019/09/24
- [PULL 36/37] qapi: Fix excessive QAPISchemaEntity.check() recursion, Markus Armbruster, 2019/09/24
- [PULL 30/37] qapi: Fix missing 'if' checks in struct, union, alternate 'data', Markus Armbruster, 2019/09/24
- [PULL 23/37] tests/qapi-schema: Demonstrate insufficient 'if' checking, Markus Armbruster, 2019/09/24
- [PULL 14/37] docs/devel/qapi-code-gen: Reorder sections for readability, Markus Armbruster, 2019/09/24
- Re: [PULL 00/37] QAPI patches for 2019-09-24, no-reply, 2019/09/24
- Re: [PULL 00/37] QAPI patches for 2019-09-24, no-reply, 2019/09/25
- Re: [PULL 00/37] QAPI patches for 2019-09-24, Peter Maydell, 2019/09/26