Commit 77daece3 authored by Markus Armbruster's avatar Markus Armbruster
Browse files

qapi: Inline check_name() into check_union() 



check_name() consists of check_name_is_str() and check_name_str().
check_union() relies on the latter to catch optional discriminators.
The next commit will replace that by a more straightforward check.
Inlining check_name() into check_union() now should make that easier
to review.

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Message-Id: <20190927134639.4284-16-armbru@redhat.com>
parent e6f9678d

scripts/qapi/common.py

+4 −2
Original line number Diff line number Diff line
@@ -897,7 +897,9 @@ def check_union(expr, info): 


        # The value of member 'discriminator' must name a non-optional

        # member of the base struct.

        check_name(discriminator, info,

        check_name_is_str(discriminator, info,

                          "discriminator of flat union '%s'" % name)

        check_name_str(discriminator, info,

                       "discriminator of flat union '%s'" % name)

        discriminator_value = base_members.get(discriminator)

        if not discriminator_value: