From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45521) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZzpQs-00044y-1O for qemu-devel@nongnu.org; Fri, 20 Nov 2015 12:25:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZzpQq-0007oi-Ig for qemu-devel@nongnu.org; Fri, 20 Nov 2015 12:25:10 -0500 Received: from mx1.redhat.com ([209.132.183.28]:35826) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZzpQq-0007oa-Cj for qemu-devel@nongnu.org; Fri, 20 Nov 2015 12:25:08 -0500 From: Eric Blake Date: Fri, 20 Nov 2015 10:24:55 -0700 Message-Id: <1448040300-968-10-git-send-email-eblake@redhat.com> In-Reply-To: <1448040300-968-1-git-send-email-eblake@redhat.com> References: <1448040300-968-1-git-send-email-eblake@redhat.com> Subject: [Qemu-devel] [PATCH v13 09/14] qapi: Prepare new QAPISchemaMember base class List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: armbru@redhat.com, Michael Roth We want to share some clash detection code between enum values and object type members. To assist with that, split off part of QAPISchemaObjectTypeMember into a new base class QAPISchemaMember that tracks name, owner, and common clash detection code; while the former keeps the additional fields for type and optional flag. Signed-off-by: Eric Blake --- v13: new patch --- scripts/qapi.py | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/scripts/qapi.py b/scripts/qapi.py index 085455b..2748464 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -1018,28 +1018,18 @@ class QAPISchemaObjectType(QAPISchemaType): self.members, self.variants) -class QAPISchemaObjectTypeMember(object): +class QAPISchemaMember(object): role = 'member' - def __init__(self, name, typ, optional): + def __init__(self, name): assert isinstance(name, str) - assert isinstance(typ, str) - assert isinstance(optional, bool) self.name = name - self._type_name = typ - self.type = None - self.optional = optional self.owner = None def set_owner(self, name): assert not self.owner self.owner = name - def check(self, schema): - assert self.owner - self.type = schema.lookup_type(self._type_name) - assert self.type - def check_clash(self, info, seen): cname = c_name(self.name) if cname in seen: @@ -1065,6 +1055,21 @@ class QAPISchemaObjectTypeMember(object): return "'%s' %s" % (self.name, self._pretty_owner()) +class QAPISchemaObjectTypeMember(QAPISchemaMember): + def __init__(self, name, typ, optional): + QAPISchemaMember.__init__(self, name) + assert isinstance(typ, str) + assert isinstance(optional, bool) + self._type_name = typ + self.type = None + self.optional = optional + + def check(self, schema): + assert self.owner + self.type = schema.lookup_type(self._type_name) + assert self.type + + class QAPISchemaObjectTypeVariants(object): def __init__(self, tag_name, tag_member, variants): # Flat unions pass tag_name but not tag_member. -- 2.4.3