From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44948) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XEnOB-0001nX-4z for qemu-devel@nongnu.org; Tue, 05 Aug 2014 18:39:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XEnO2-0004sq-Rk for qemu-devel@nongnu.org; Tue, 05 Aug 2014 18:39:27 -0400 Received: from qmta14.emeryville.ca.mail.comcast.net ([2001:558:fe2d:44:76:96:27:212]:44036) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XEnO2-0004qh-K6 for qemu-devel@nongnu.org; Tue, 05 Aug 2014 18:39:18 -0400 From: Eric Blake Date: Tue, 5 Aug 2014 16:39:00 -0600 Message-Id: <1407278346-17427-9-git-send-email-eblake@redhat.com> In-Reply-To: <1407278346-17427-1-git-send-email-eblake@redhat.com> References: <1407278346-17427-1-git-send-email-eblake@redhat.com> Subject: [Qemu-devel] [PATCH v2 08/14] qapi: add expr_name() helper List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Fam Zheng , Markus Armbruster , wenchaoqemu@gmail.com, Luiz Capitulino Now that we know every expression has a known meta-type, we can add a helper function that retrieves the name of an arbitrary expression, for use in future error messages. * scripts/qapi.py (expr_name): New function. Signed-off-by: Eric Blake --- scripts/qapi.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/scripts/qapi.py b/scripts/qapi.py index 910e422..e02fa0b 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -248,6 +248,19 @@ def discriminator_find_enum_define(expr): return find_enum(discriminator_type) +def expr_name(expr): + if expr.has_key('union'): + return expr['union'] + if expr.has_key('type'): + return expr['type'] + if expr.has_key('enum'): + return expr['enum'] + if expr.has_key('command'): + return expr['command'] + if expr.has_key('event'): + return expr['event'] + return None + def check_event(expr, expr_info): params = expr.get('data') if params: -- 1.9.3