From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44906) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WnSK1-000352-Pe for qemu-devel@nongnu.org; Thu, 22 May 2014 08:42:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WnSJv-0002BC-6N for qemu-devel@nongnu.org; Thu, 22 May 2014 08:42:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49677) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WnSJu-0002B5-Su for qemu-devel@nongnu.org; Thu, 22 May 2014 08:42:03 -0400 From: Amos Kong Date: Thu, 22 May 2014 20:41:44 +0800 Message-Id: <1400762504-22751-4-git-send-email-akong@redhat.com> In-Reply-To: <1400762504-22751-1-git-send-email-akong@redhat.com> References: <1400762504-22751-1-git-send-email-akong@redhat.com> Subject: [Qemu-devel] [PATCH v5 3/3] qapi: Suppress unwanted space between type and identifier List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, lcapitulino@redhat.com, mdroth@linux.vnet.ibm.com, armbru@redhat.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-commands.py | 2 +- scripts/qapi.py | 19 +++++++++++++------ 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/scripts/qapi-commands.py b/scripts/qapi-commands.py index 34f200a..4b49735 100644 --- a/scripts/qapi-commands.py +++ b/scripts/qapi-commands.py @@ -102,7 +102,7 @@ def gen_visitor_input_vars_decl(args): bool has_%(argname)s = false; ''', argname=c_var(argname)) - if c_type(argtype).endswith("*"): + if c_type(argtype).endswith("*" + eatspace): ret += mcgen(''' %(argtype)s %(argname)s = NULL; ''', diff --git a/scripts/qapi.py b/scripts/qapi.py index dc690bb..562d560 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -470,11 +470,17 @@ def find_enum(name): def is_enum(name): return find_enum(name) != None +eatspace = '\033EATSPACE.' + +# A special suffix is added in c_type() for pointer types, and it's +# stripped in mcgen(). So please notice this when you check the return +# value of c_type() outside mcgen(). 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 @@ -488,15 +494,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 = "" @@ -521,7 +527,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