From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39820) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ypc0o-0002Hu-4h for qemu-devel@nongnu.org; Tue, 05 May 2015 08:31:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ypc0k-0002la-2h for qemu-devel@nongnu.org; Tue, 05 May 2015 08:31:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46814) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ypc0j-0002lL-QR for qemu-devel@nongnu.org; Tue, 05 May 2015 08:31:42 -0400 From: Eric Blake Date: Tue, 5 May 2015 06:30:42 -0600 Message-Id: <1430829055-4739-2-git-send-email-eblake@redhat.com> In-Reply-To: <1430829055-4739-1-git-send-email-eblake@redhat.com> References: <1430829055-4739-1-git-send-email-eblake@redhat.com> Subject: [Qemu-devel] [PATCH v3 01/14] qapi: Fix C identifiers generated for names containing '.' List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, akong@redhat.com, berto@igalia.com, armbru@redhat.com, mdroth@linux.vnet.ibm.com From: Markus Armbruster c_fun() maps '.' to '_', c_var() doesn't. Nothing prevents '.' in QAPI names that get passed to c_var(). Which QAPI names get passed to c_fun(), to c_var(), or to both is not obvious. Names of command parameters and struct type members get passed to c_var(). c_var() strips a leading '*', but this cannot happen. c_fun() doesn't. Fix c_var() to work exactly like c_fun(). Perhaps they should be replaced by a single mapping function. Signed-off-by: Markus Armbruster [add 'import string'] Signed-off-by: Eric Blake Reviewed-by: Alberto Garcia --- scripts/qapi.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/scripts/qapi.py b/scripts/qapi.py index edfaf9e..ca1adf2 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -15,6 +15,7 @@ import re from ordereddict import OrderedDict import os import sys +import string builtin_types = { 'str': 'QTYPE_QSTRING', @@ -752,6 +753,8 @@ def camel_case(name): new_name += ch.lower() return new_name +c_var_trans = string.maketrans('.-', '__') + def c_var(name, protect=True): # ANSI X3J11/88-090, 3.1.1 c89_words = set(['auto', 'break', 'case', 'char', 'const', 'continue', @@ -781,10 +784,10 @@ def c_var(name, protect=True): polluted_words = set(['unix', 'errno']) if protect and (name in c89_words | c99_words | c11_words | gcc_words | cpp_words | polluted_words): return "q_" + name - return name.replace('-', '_').lstrip("*") + return name.translate(c_var_trans) def c_fun(name, protect=True): - return c_var(name, protect).replace('.', '_') + return c_var(name, protect) def c_list_type(name): return '%sList' % name -- 2.1.0