xemu-project/xemu
1
0
Fork 0
mirror of https://github.com/xemu-project/xemu.git synced 2025-02-05 19:47:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

qapi: Fold normalize_if() into check_if()

Browse Source 
check_if() is always called together with normalize_if().  Fold the
latter into the former.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20191024110237.30963-15-armbru@redhat.com>
This commit is contained in:
Markus Armbruster 2019-10-24 13:02:32 +02:00
parent 1192a4862b
commit c145bfda18
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
scripts/qapi/expr.py
View File

@ -95,12 +95,6 @@ def check_flags(expr, info):
info, "flag '%s' may only use true value" % key) info, "flag '%s' may only use true value" % key)
def normalize_if(expr):
ifcond = expr.get('if')
if isinstance(ifcond, str):
expr['if'] = [ifcond]
def check_if(expr, info, source): def check_if(expr, info, source):
def check_if_str(ifcond, info): def check_if_str(ifcond, info):
@ -126,6 +120,7 @@ def check_if(expr, info, source):
check_if_str(elt, info) check_if_str(elt, info)
else: else:
check_if_str(ifcond, info) check_if_str(ifcond, info)
expr['if'] = [ifcond]
def normalize_members(members): def normalize_members(members):
@ -175,7 +170,6 @@ def check_type(value, info, source,
raise QAPISemError(info, "%s uses reserved name" % key_source) raise QAPISemError(info, "%s uses reserved name" % key_source)
check_keys(arg, info, key_source, ['type'], ['if']) check_keys(arg, info, key_source, ['type'], ['if'])
check_if(arg, info, key_source) check_if(arg, info, key_source)
normalize_if(arg)
check_type(arg['type'], info, key_source, allow_array=True) check_type(arg['type'], info, key_source, allow_array=True)
@ -198,7 +192,6 @@ def check_features(features, info):
source = "%s '%s'" % (source, f['name']) source = "%s '%s'" % (source, f['name'])
check_name_str(f['name'], info, source) check_name_str(f['name'], info, source)
check_if(f, info, source) check_if(f, info, source)
normalize_if(f)
def normalize_enum(expr): def normalize_enum(expr):
@ -227,7 +220,6 @@ def check_enum(expr, info):
check_name_str(member['name'], info, source, check_name_str(member['name'], info, source,
enum_member=True, permit_upper=permit_upper) enum_member=True, permit_upper=permit_upper)
check_if(member, info, source) check_if(member, info, source)
normalize_if(member)
def check_struct(expr, info): def check_struct(expr, info):
@ -259,7 +251,6 @@ def check_union(expr, info):
check_name_str(key, info, source) check_name_str(key, info, source)
check_keys(value, info, source, ['type'], ['if']) check_keys(value, info, source, ['type'], ['if'])
check_if(value, info, source) check_if(value, info, source)
normalize_if(value)
check_type(value['type'], info, source, allow_array=not base) check_type(value['type'], info, source, allow_array=not base)
@ -273,7 +264,6 @@ def check_alternate(expr, info):
check_name_str(key, info, source) check_name_str(key, info, source)
check_keys(value, info, source, ['type'], ['if']) check_keys(value, info, source, ['type'], ['if'])
check_if(value, info, source) check_if(value, info, source)
normalize_if(value)
check_type(value['type'], info, source) check_type(value['type'], info, source)
@ -376,7 +366,6 @@ def check_exprs(exprs):
else: else:
assert False, 'unexpected meta type' assert False, 'unexpected meta type'
normalize_if(expr)
check_if(expr, info, meta) check_if(expr, info, meta)
check_flags(expr, info) check_flags(expr, info)