Commit ad1ecfc6 authored by Markus Armbruster's avatar Markus Armbruster
Browse files

qapi: Fold normalize_enum() into check_enum() 



check_features() is always called together with normalize_features().
Fold the latter into the former.

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Message-Id: <20191024110237.30963-17-armbru@redhat.com>
parent 2ce51ef6

scripts/qapi/expr.py

+2 −7
Original line number Diff line number Diff line
@@ -190,12 +190,6 @@ def check_features(features, info): 
        check_if(f, info, source)





def normalize_enum(expr):

    if isinstance(expr['data'], list):

        expr['data'] = [m if isinstance(m, dict) else {'name': m}

                        for m in expr['data']]





def check_enum(expr, info):

    name = expr['enum']

    members = expr['data']
@@ -208,6 +202,8 @@ def check_enum(expr, info): 


    permit_upper = name in info.pragma.name_case_whitelist



    members[:] = [m if isinstance(m, dict) else {'name': m}

                  for m in members]

    for member in members:

        source = "'data' member"

        check_keys(member, info, source, ['name'], ['if'])
@@ -325,7 +321,6 @@ def check_exprs(exprs): 
        if meta == 'enum':

            check_keys(expr, info, meta,

                       ['enum', 'data'], ['if', 'prefix'])

            normalize_enum(expr)

            check_enum(expr, info)

        elif meta == 'union':

            check_keys(expr, info, meta,