Currently we always add a space after c_type in mcgen(), there is
some redundant space in generated code. The space isn't needed for
points by the coding style.
char * value;
^
qapi_free_NameInfo(NameInfo * obj)
^
This patch added a special string 'EATSPACE' in the end of c_type()'s
result only for point type. The string and the following space will be
striped in mcgen().
Signed-off-by: Amos Kong <ak...@redhat.com>
---
scripts/qapi-commands.py | 2 +-
scripts/qapi.py | 11 ++++++-----
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/scripts/qapi-commands.py b/scripts/qapi-commands.py
index 9734ab0..0ebb1b9 100644
--- a/scripts/qapi-commands.py
+++ b/scripts/qapi-commands.py
@@ -26,7 +26,7 @@ def type_visitor(name):
def generate_command_decl(name, args, ret_type):
arglist=""
for argname, argtype, optional, structured in parse_args(args):
- argtype = c_type(argtype)
+ argtype = c_type(argtype).replace('EATSPACE', '')
if argtype == "char *":
argtype = "const char *"
if optional:
diff --git a/scripts/qapi.py b/scripts/qapi.py
index b474c39..b46c518 100644
--- a/scripts/qapi.py
+++ b/scripts/qapi.py
@@ -423,7 +423,7 @@ def is_enum(name):
def c_type(name):
if name == 'str':
- return 'char *'
+ return 'char *EATSPACE'
elif name == 'int':
return 'int64_t'
elif (name == 'int8' or name == 'int16' or name == 'int32' or
@@ -437,15 +437,15 @@ def c_type(name):
elif name == 'number':
return 'double'
elif type(name) == list:
- return '%s *' % c_list_type(name[0])
+ return '%s *EATSPACE' % c_list_type(name[0])
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 *EATSPACE' % camel_case(name)
else:
- return '%s *' % name
+ return '%s *EATSPACE' % name
def genindent(count):
ret = ""
@@ -470,7 +470,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 raw.replace('*EATSPACE ', '*')
def basename(filename):
return filename.split("/")[-1]
--
1.9.0
