From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53871) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a3zqp-0007nY-9j for qemu-devel@nongnu.org; Wed, 02 Dec 2015 00:21:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a3zqn-0007Rv-Gh for qemu-devel@nongnu.org; Wed, 02 Dec 2015 00:21:11 -0500 Received: from mx1.redhat.com ([209.132.183.28]:59991) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a3zqn-0007RU-6v for qemu-devel@nongnu.org; Wed, 02 Dec 2015 00:21:09 -0500 From: Eric Blake Date: Tue, 1 Dec 2015 22:20:56 -0700 Message-Id: <1449033659-25497-13-git-send-email-eblake@redhat.com> In-Reply-To: <1449033659-25497-1-git-send-email-eblake@redhat.com> References: <1449033659-25497-1-git-send-email-eblake@redhat.com> Subject: [Qemu-devel] [PATCH v14 12/15] qapi: Populate info['name'] for each entity List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: armbru@redhat.com, Michael Roth Every non-implicit entity is associated with an 'info' dictionary, but it is not easy to reverse-engineer the name of the top-most entity associated with that 'info'. For example, inside QAPISchemaMember.check_clash(), the value of self.owner may be the implicit ':obj-block_passwd-arg', while we want to report any problems on behalf of the top-level 'block_passwd' command entity. And while we have a ._pretty_owner() that maps from implicit names back to a human readable phrase, that is more than just a plain top-level entity name. What's more, the .check_clash() method may be called for the same member object more than once, with different caller 'info' objects (such as a base and derived object); if a clash is only introduced in the derived class, reporting the error on behalf of the base class named in member.owner seems wrong. Add a new info['name'] field to track the information we need; it will be handy for better error messages in future commits. Unfortunately, there is no one good place to add the mapping: at the point 'info' is created in QAPISchemaParser.__init__(), we don't know the name. Info is then stored into QAPISchemaParser.exprs, which then then gets fed to QAPISchema.__init__() via the global check_exprs(), but we want check_exprs() to go away. And QAPISchema._def_exprs() sees every entity, except that the various _def_FOO() helpers don't return anything. So we have to modify all of the _def_FOO() methods. Signed-off-by: Eric Blake --- v14: rearrange assignment, improve commit message v13: new patch --- scripts/qapi.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/qapi.py b/scripts/qapi.py index 8fad7c8..7de405c 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -1299,7 +1299,7 @@ class QAPISchema(object): return name def _def_enum_type(self, expr, info): - name = expr['enum'] + name = info['name'] = expr['enum'] data = expr['data'] prefix = expr.get('prefix') self._def_entity(QAPISchemaEnumType( @@ -1320,7 +1320,7 @@ class QAPISchema(object): for (key, value) in data.iteritems()] def _def_struct_type(self, expr, info): - name = expr['struct'] + name = info['name'] = expr['struct'] base = expr.get('base') data = expr['data'] self._def_entity(QAPISchemaObjectType(name, info, base, @@ -1339,7 +1339,7 @@ class QAPISchema(object): return QAPISchemaObjectTypeVariant(case, typ) def _def_union_type(self, expr, info): - name = expr['union'] + name = info['name'] = expr['union'] data = expr['data'] base = expr.get('base') tag_name = expr.get('discriminator') @@ -1362,7 +1362,7 @@ class QAPISchema(object): variants))) def _def_alternate_type(self, expr, info): - name = expr['alternate'] + name = info['name'] = expr['alternate'] data = expr['data'] variants = [self._make_variant(key, value) for (key, value) in data.iteritems()] @@ -1374,7 +1374,7 @@ class QAPISchema(object): variants))) def _def_command(self, expr, info): - name = expr['command'] + name = info['name'] = expr['command'] data = expr.get('data') rets = expr.get('returns') gen = expr.get('gen', True) @@ -1389,7 +1389,7 @@ class QAPISchema(object): success_response)) def _def_event(self, expr, info): - name = expr['event'] + name = info['name'] = expr['event'] data = expr.get('data') if isinstance(data, OrderedDict): data = self._make_implicit_object_type( -- 2.4.3