From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45584) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZzpQt-00047f-NU for qemu-devel@nongnu.org; Fri, 20 Nov 2015 12:25:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZzpQs-0007qD-4p for qemu-devel@nongnu.org; Fri, 20 Nov 2015 12:25:11 -0500 Received: from mx1.redhat.com ([209.132.183.28]:49537) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZzpQr-0007pQ-Ju for qemu-devel@nongnu.org; Fri, 20 Nov 2015 12:25:10 -0500 From: Eric Blake Date: Fri, 20 Nov 2015 10:24:57 -0700 Message-Id: <1448040300-968-12-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 11/14] 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. Add a new info['name'] field to track this information, as it will be handy in future commits for better error messages. Signed-off-by: Eric Blake --- scripts/qapi.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/qapi.py b/scripts/qapi.py index d1239c2..ff3fccb 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -1296,7 +1296,7 @@ class QAPISchema(object): return name def _def_enum_type(self, expr, info): - name = expr['enum'] + info['name'] = name = expr['enum'] data = expr['data'] prefix = expr.get('prefix') self._def_entity(QAPISchemaEnumType( @@ -1317,7 +1317,7 @@ class QAPISchema(object): for (key, value) in data.iteritems()] def _def_struct_type(self, expr, info): - name = expr['struct'] + info['name'] = name = expr['struct'] base = expr.get('base') data = expr['data'] self._def_entity(QAPISchemaObjectType(name, info, base, @@ -1336,7 +1336,7 @@ class QAPISchema(object): return QAPISchemaObjectTypeVariant(case, typ) def _def_union_type(self, expr, info): - name = expr['union'] + info['name'] = name = expr['union'] data = expr['data'] base = expr.get('base') tag_name = expr.get('discriminator') @@ -1359,7 +1359,7 @@ class QAPISchema(object): variants))) def _def_alternate_type(self, expr, info): - name = expr['alternate'] + info['name'] = name = expr['alternate'] data = expr['data'] variants = [self._make_variant(key, value) for (key, value) in data.iteritems()] @@ -1371,7 +1371,7 @@ class QAPISchema(object): variants))) def _def_command(self, expr, info): - name = expr['command'] + info['name'] = name = expr['command'] data = expr.get('data') rets = expr.get('returns') gen = expr.get('gen', True) @@ -1386,7 +1386,7 @@ class QAPISchema(object): success_response)) def _def_event(self, expr, info): - name = expr['event'] + info['name'] = name = expr['event'] data = expr.get('data') if isinstance(data, OrderedDict): data = self._make_implicit_object_type( -- 2.4.3