qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Qemu-devel] [PATCH v10 22/30] qapi: Simplify QAPISchemaObjectTypeVa


From: Markus Armbruster
Subject: Re: [Qemu-devel] [PATCH v10 22/30] qapi: Simplify QAPISchemaObjectTypeVariants.check()
Date: Mon, 09 Nov 2015 13:38:58 +0100
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux)

Eric Blake <address@hidden> writes:

> From: Markus Armbruster <address@hidden>
>
> Reduce the ugly flat union / simple union conditional by doing just
> the essential work here, namely setting self.tag_member.
> Move the rest to callers.
>
> Signed-off-by: Markus Armbruster <address@hidden>
> Message-Id: <address@hidden>
> [rebase to earlier changes that moved tag_member.check() of
> alternate types, and tweak commit title and wording]
> Signed-off-by: Eric Blake <address@hidden>
>
> ---
> v10: redo closer to Markus' original proposal
> v9: new patch
> ---
>  scripts/qapi.py | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/scripts/qapi.py b/scripts/qapi.py
> index 2a73b2b..e057408 100644
> --- a/scripts/qapi.py
> +++ b/scripts/qapi.py
> @@ -988,9 +988,10 @@ class QAPISchemaObjectType(QAPISchemaType):
>          for m in self.local_members:
>              m.check(schema)
>              m.check_clash(seen)
> +        self.members = seen.values()
>          if self.variants:
>              self.variants.check(schema, seen)
> -        self.members = seen.values()
> +            assert self.variants.tag_member in self.members
>
>      def is_implicit(self):
>          # See QAPISchema._make_implicit_object_type()
> @@ -1052,8 +1053,6 @@ class QAPISchemaObjectTypeVariants(object):
>      def check(self, schema, seen):
>          if self.tag_name:    # flat union
>              self.tag_member = seen[self.tag_name]

My patch has:

  -        if self.tag_name:    # flat union
  +        if not self.tag_member: # flat union
               self.tag_member = seen[self.tag_name]

Any particular reason for dropping it?

I like my change, because I feel it makes the assignment's purpose more
obvious: ensure .tag_member is set.

> -        if seen:
> -            assert self.tag_member in seen.itervalues()
>          assert isinstance(self.tag_member.type, QAPISchemaEnumType)
>          for v in self.variants:
>              v.check(schema, self.tag_member.type)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]