OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

qapi: Suppress unwanted space between type and identifier

Browse Source 
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 <akong@redhat.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
This commit is contained in:
Amos Kong 2014-06-10 19:25:53 +08:00 committed by Luiz Capitulino
parent 0d14eeb233
commit 05dfb26cd2
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/qapi-commands.py
View File

@ -102,7 +102,7 @@ def gen_visitor_input_vars_decl(args):
bool has_%(argname)s = false; bool has_%(argname)s = false;
''', ''',
argname=c_var(argname)) argname=c_var(argname))
if c_type(argtype).endswith("*"): if is_c_ptr(argtype):
ret += mcgen(''' ret += mcgen('''
%(argtype)s %(argname)s = NULL; %(argtype)s %(argname)s = NULL;
''', ''',
@ -227,7 +227,7 @@ def gen_marshal_input(name, args, ret_type, middle_mode):
''') ''')
if ret_type: if ret_type:
if c_type(ret_type).endswith("*"): if is_c_ptr(ret_type):
retval = " %s retval = NULL;" % c_type(ret_type) retval = " %s retval = NULL;" % c_type(ret_type)
else: else:
retval = " %s retval;" % c_type(ret_type) retval = " %s retval;" % c_type(ret_type)

23
scripts/qapi.py
View File

@ -470,11 +470,17 @@ def find_enum(name):
def is_enum(name): def is_enum(name):
return find_enum(name) != None 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): def c_type(name, is_param=False):
if name == 'str': if name == 'str':
if is_param: if is_param:
return 'const char *' return 'const char *' + eatspace
return 'char *' return 'char *' + eatspace
elif name == 'int': elif name == 'int':
return 'int64_t' return 'int64_t'
elif (name == 'int8' or name == 'int16' or name == 'int32' or elif (name == 'int8' or name == 'int16' or name == 'int32' or
@ -488,15 +494,19 @@ def c_type(name, is_param=False):
elif name == 'number': elif name == 'number':
return 'double' return 'double'
elif type(name) == list: elif type(name) == list:
return '%s *' % c_list_type(name[0]) return '%s *%s' % (c_list_type(name[0]), eatspace)
elif is_enum(name): elif is_enum(name):
return name return name
elif name == None or len(name) == 0: elif name == None or len(name) == 0:
return 'void' return 'void'
elif name == name.upper(): elif name == name.upper():
return '%sEvent *' % camel_case(name) return '%sEvent *%s' % (camel_case(name), eatspace)
else: else:
return '%s *' % name return '%s *%s' % (name, eatspace)
def is_c_ptr(name):
suffix = "*" + eatspace
return c_type(name).endswith(suffix)
def genindent(count): def genindent(count):
ret = "" ret = ""
@ -521,7 +531,8 @@ def cgen(code, **kwds):
return '\n'.join(lines) % kwds + '\n' return '\n'.join(lines) % kwds + '\n'
def mcgen(code, **kwds): 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): def basename(filename):
return filename.split("/")[-1] return filename.split("/")[-1]