From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48772) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zhs0l-0003kP-NP for qemu-devel@nongnu.org; Fri, 02 Oct 2015 00:32:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zhs0j-0006Xv-9J for qemu-devel@nongnu.org; Fri, 02 Oct 2015 00:31:59 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60528) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zhs0j-0006Xr-1F for qemu-devel@nongnu.org; Fri, 02 Oct 2015 00:31:57 -0400 From: Eric Blake Date: Thu, 1 Oct 2015 22:31:42 -0600 Message-Id: <1443760312-656-3-git-send-email-eblake@redhat.com> In-Reply-To: <1443760312-656-1-git-send-email-eblake@redhat.com> References: <1443760312-656-1-git-send-email-eblake@redhat.com> Subject: [Qemu-devel] [PATCH v6 02/12] qapi: Don't use info as witness of implicit object type List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Michael Roth , marcandre.lureau@redhat.com, armbru@redhat.com, ehabkost@redhat.com A future patch will enable error reporting from the various QAPISchema*.check() methods. But to report an error related to an implicit type, we'll need to associate a location with the type (the same location as the top-level entity that is causing the creation of the implicit type), and once we do that, keying off of whether foo.info exists is no longer a viable way to determine if foo is an implicit type. Instead, add an is_implicit() method to QAPISchemaObjectType, and use that function where needed. (Done at the ObjectType level, since we already know all builtins and arrays are implicit, no commands or events are implicit, and we don't have any differences in generated code for regular vs. implicit enums.) Signed-off-by: Eric Blake --- v6: split 11/46 into pieces; don't rename _info yet; rework atop nicer filtering mechanism, including no need to change visitor signature --- scripts/qapi-types.py | 3 ++- scripts/qapi-visit.py | 3 ++- scripts/qapi.py | 10 +++++++--- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/scripts/qapi-types.py b/scripts/qapi-types.py index c5b71b0..6bac5b3 100644 --- a/scripts/qapi-types.py +++ b/scripts/qapi-types.py @@ -234,7 +234,8 @@ class QAPISchemaGenTypeVisitor(QAPISchemaVisitor): self._btin = None def visit_predicate(self, entity): - return not isinstance(entity, QAPISchemaObjectType) or entity.info + return not (isinstance(entity, QAPISchemaObjectType) and + entity.is_implicit()) def _gen_type_cleanup(self, name): self.decl += gen_type_cleanup_decl(name) diff --git a/scripts/qapi-visit.py b/scripts/qapi-visit.py index 0f47614..2957c85 100644 --- a/scripts/qapi-visit.py +++ b/scripts/qapi-visit.py @@ -334,7 +334,8 @@ class QAPISchemaGenVisitVisitor(QAPISchemaVisitor): self._btin = None def visit_predicate(self, entity): - return not isinstance(entity, QAPISchemaObjectType) or entity.info + return not (isinstance(entity, QAPISchemaObjectType) and + entity.is_implicit()) def visit_enum_type(self, name, info, values, prefix): self.decl += gen_visit_decl(name, scalar=True) diff --git a/scripts/qapi.py b/scripts/qapi.py index 7d359c8..8123ab3 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -970,12 +970,15 @@ class QAPISchemaObjectType(QAPISchemaType): self.variants.check(schema, members, seen) self.members = members + def is_implicit(self): + return self.name[0] == ':' + def c_name(self): - assert self.info + assert not self.is_implicit() return QAPISchemaType.c_name(self) def c_type(self, is_param=False): - assert self.info + assert not self.is_implicit() return QAPISchemaType.c_type(self) def json_type(self): @@ -1043,7 +1046,8 @@ class QAPISchemaObjectTypeVariant(QAPISchemaObjectTypeMember): # This function exists to support ugly simple union special cases # TODO get rid of them, and drop the function def simple_union_type(self): - if isinstance(self.type, QAPISchemaObjectType) and not self.type.info: + if isinstance(self.type, + QAPISchemaObjectType) and self.type.is_implicit(): assert len(self.type.members) == 1 assert not self.type.variants return self.type.members[0].type -- 2.4.3