From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43891) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WiCvo-0003qO-Rm for qemu-devel@nongnu.org; Wed, 07 May 2014 21:15:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WiCvh-0008Bp-RO for qemu-devel@nongnu.org; Wed, 07 May 2014 21:15:28 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60934) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WiCvh-0008Bb-J5 for qemu-devel@nongnu.org; Wed, 07 May 2014 21:15:21 -0400 From: Amos Kong Date: Thu, 8 May 2014 09:14:40 +0800 Message-Id: <1399511680-12811-4-git-send-email-akong@redhat.com> In-Reply-To: <1399511680-12811-1-git-send-email-akong@redhat.com> References: <1399511680-12811-1-git-send-email-akong@redhat.com> Subject: [Qemu-devel] [PATCH v4 3/3] qapi: Suppress unwanted space between type and identifier List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: lcapitulino@redhat.com, qemu-devel@nongnu.org Cc: pbonzini@redhat.com, armbru@redhat.com, mdroth@linux.vnet.ibm.com We always generate a space between type and identifier in parameter and variable declarations, even when idiomatic C style doesn't have a space there. Suppress it. Signed-off-by: Amos Kong --- scripts/qapi.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/scripts/qapi.py b/scripts/qapi.py index 1bc2bd9..912787a 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -462,11 +462,14 @@ def find_enum(name): def is_enum(name): return find_enum(name) != None +eatspace = '\033EATSPACE.' + def c_type(name, is_param=False): if name == 'str': if is_param: - return 'const char *' - return 'char *' + return 'const char *' + eatspace + return 'char *' + eatspace + elif name == 'int': return 'int64_t' elif (name == 'int8' or name == 'int16' or name == 'int32' or @@ -480,15 +483,15 @@ def c_type(name, is_param=False): elif name == 'number': return 'double' elif type(name) == list: - return '%s *' % c_list_type(name[0]) + return '%s *%s' % (c_list_type(name[0]), eatspace) elif is_enum(name): return name elif name == None or len(name) == 0: return 'void' elif name == name.upper(): - return '%sEvent *' % camel_case(name) + return '%sEvent *%s' % (camel_case(name), eatspace) else: - return '%s *' % name + return '%s *%s' % (name, eatspace) def genindent(count): ret = "" @@ -513,7 +516,8 @@ def cgen(code, **kwds): return '\n'.join(lines) % kwds + '\n' def mcgen(code, **kwds): - return cgen('\n'.join(code.split('\n')[1:-1]), **kwds) + raw = cgen('\n'.join(code.split('\n')[1:-1]), **kwds) + return re.sub(re.escape(eatspace) + ' *', '', raw) def basename(filename): return filename.split("/")[-1] -- 1.9.0