From patchwork Thu Feb 27 11:09:32 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wenchao Xia X-Patchwork-Id: 324774 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 33AAA2C009C for ; Thu, 27 Feb 2014 22:14:11 +1100 (EST) Received: from localhost ([::1]:45424 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WIyum-00084P-Tb for incoming@patchwork.ozlabs.org; Thu, 27 Feb 2014 06:14:08 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42796) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WIyrZ-00039P-Re for qemu-devel@nongnu.org; Thu, 27 Feb 2014 06:10:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WIyrT-0006B1-3g for qemu-devel@nongnu.org; Thu, 27 Feb 2014 06:10:49 -0500 Received: from mail-pa0-x243.google.com ([2607:f8b0:400e:c03::243]:36253) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WIyrS-0006AS-OB for qemu-devel@nongnu.org; Thu, 27 Feb 2014 06:10:43 -0500 Received: by mail-pa0-f67.google.com with SMTP id rd3so1229606pab.6 for ; Thu, 27 Feb 2014 03:10:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=rYzTX+w5qCqWnBW4+pTcXaVpYQ9z7ZCx/rkojyr+CA0=; b=XthHEyyXQbQHnIdW6UHMqLj1dmtijGxVFwUqOy3RCfh7ybS+zrFujj/Wvt57Khld1P XN5Fj17TPOz7rN7TB27l7XbEf7OBLVtSMJnLluhlujwnvutvaVfOlwn8LB2Pi5y8yj2w ctuPo2BsYscU0fidRvpQzNhQBj3vk2jX5Ehbz/r3njhU8JAuEPNMHXn8ifb0QijAn0T7 GykIW5Vmp9oF+LRRnkrYc7kM3s8CmIrHL3/FYlTaC65BsdaLYknS5P9a6/AmwDAVEvrR nZ8Q7VfUzSuWzhrLtgKjtddMQkOQo/4Q9y9LrbX2XdP4KSU5EHgCWHofAo4t6O9crrRA sU9g== X-Received: by 10.66.27.48 with SMTP id q16mr14697453pag.9.1393499441957; Thu, 27 Feb 2014 03:10:41 -0800 (PST) Received: from localhost.localdomain.localdomain ([113.247.8.2]) by mx.google.com with ESMTPSA id my6sm7286267pbc.36.2014.02.27.03.10.35 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 27 Feb 2014 03:10:41 -0800 (PST) From: Wenchao Xia To: qemu-devel@nongnu.org Date: Thu, 27 Feb 2014 03:09:32 -0800 Message-Id: <1393499376-4374-7-git-send-email-wenchaoqemu@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1393499376-4374-1-git-send-email-wenchaoqemu@gmail.com> References: <1393499376-4374-1-git-send-email-wenchaoqemu@gmail.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400e:c03::243 Cc: kwolf@redhat.com, Wenchao Xia , mdroth@linux.vnet.ibm.com, armbru@redhat.com, lcapitulino@redhat.com, Wenchao Xia Subject: [Qemu-devel] [PATCH V8 06/10] qapi script: use same function to generate enum string X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Wenchao Xia Prior to this patch, qapi-visit.py used custom code to generate enum names used for handling a qapi union. Fix it to instead reuse common code, with identical generated results, and allowing future updates to generation to only need to touch one place. Signed-off-by: Wenchao Xia Signed-off-by: Wenchao Xia Reviewed-by: Eric Blake --- scripts/qapi-types.py | 6 +++--- scripts/qapi-visit.py | 19 +++++++++++++------ scripts/qapi.py | 13 +++++++++---- 3 files changed, 25 insertions(+), 13 deletions(-) diff --git a/scripts/qapi-types.py b/scripts/qapi-types.py index 35ad993..5885bac 100644 --- a/scripts/qapi-types.py +++ b/scripts/qapi-types.py @@ -144,11 +144,11 @@ typedef enum %(name)s i = 0 for value in enum_values: + enum_full_value = generate_enum_full_value(name, value) enum_decl += mcgen(''' - %(abbrev)s_%(value)s = %(i)d, + %(enum_full_value)s = %(i)d, ''', - abbrev=de_camel_case(name).upper(), - value=generate_enum_name(value), + enum_full_value = enum_full_value, i=i) i += 1 diff --git a/scripts/qapi-visit.py b/scripts/qapi-visit.py index c6de9ae..0baaf60 100644 --- a/scripts/qapi-visit.py +++ b/scripts/qapi-visit.py @@ -214,18 +214,22 @@ void visit_type_%(name)s(Visitor *m, %(name)s ** obj, const char *name, Error ** ''', name=name) + # For anon union, always use the default enum type automatically generated + # as "'%sKind' % (name)" + disc_type = '%sKind' % (name) + for key in members: assert (members[key] in builtin_types or find_struct(members[key]) or find_union(members[key])), "Invalid anonymous union member" + enum_full_value = generate_enum_full_value(disc_type, key) ret += mcgen(''' - case %(abbrev)s_KIND_%(enum)s: + case %(enum_full_value)s: visit_type_%(c_type)s(m, &(*obj)->%(c_name)s, name, &err); break; ''', - abbrev = de_camel_case(name).upper(), - enum = c_fun(de_camel_case(key),False).upper(), + enum_full_value = enum_full_value, c_type = type_name(members[key]), c_name = c_fun(key)) @@ -255,7 +259,10 @@ def generate_visit_union(expr): assert not base return generate_visit_anon_union(name, members) + # There will always be a discriminator in the C switch code, by default it + # is an enum type generated silently as "'%sKind' % (name)" ret = generate_visit_enum('%sKind' % name, members.keys()) + disc_type = '%sKind' % (name) if base: base_fields = find_struct(base)['data'] @@ -313,13 +320,13 @@ void visit_type_%(name)s(Visitor *m, %(name)s ** obj, const char *name, Error ** visit_end_implicit_struct(m, &err); }''' + enum_full_value = generate_enum_full_value(disc_type, key) ret += mcgen(''' - case %(abbrev)s_KIND_%(enum)s: + case %(enum_full_value)s: ''' + fmt + ''' break; ''', - abbrev = de_camel_case(name).upper(), - enum = c_fun(de_camel_case(key),False).upper(), + enum_full_value = enum_full_value, c_type=type_name(members[key]), c_name=c_fun(key)) diff --git a/scripts/qapi.py b/scripts/qapi.py index dadf5a5..60cc12e 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -486,12 +486,17 @@ def guardend(name): ''', name=guardname(name)) -def generate_enum_name(name): - if name.isupper(): - return c_fun(name, False) +def _generate_enum_value_string(value): + if value.isupper(): + return c_fun(value, False) new_name = '' - for c in c_fun(name, False): + for c in c_fun(value, False): if c.isupper(): new_name += '_' new_name += c return new_name.lstrip('_').upper() + +def generate_enum_full_value(enum_name, enum_value): + abbrev_string = de_camel_case(enum_name).upper() + value_string = _generate_enum_value_string(enum_value) + return "%s_%s" % (abbrev_string, value_string)