Proxmox-Port/qemu
1
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2025-07-27 12:20:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

qapi: Clean up cgen() and mcgen()

Browse Source 
Commit 05dfb26 added eatspace stripping to mcgen().  Move it to
cgen(), just in case somebody gets tempted to use cgen() directly
instead of via mcgen().

cgen() indents blank lines.  No such lines get generated right now,
but fix it anyway.

We use triple-quoted strings for program text, like this:

    '''
    Program text
    any number of lines
    '''

Keeps the program text relatively readable, but puts an extra newline
at either end.  mcgen() "fixes" that by dropping the first and last
line outright.  Drop only the newlines.

This unmasks a bug in qapi-commands.py: four quotes instead of three.
Fix it up.

Output doesn't change

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Markus Armbruster 2015-06-24 19:27:32 +02:00
parent 4247f83900
commit 77e703b861
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/qapi-commands.py
View File

@ -56,7 +56,7 @@ def gen_sync_call(name, args, ret_type, indent=0):
name=c_name(name), args=arglist, retval=retval).rstrip() name=c_name(name), args=arglist, retval=retval).rstrip()
if ret_type: if ret_type:
ret += "\n" + gen_err_check('local_err') ret += "\n" + gen_err_check('local_err')
ret += "\n" + mcgen('''' ret += "\n" + mcgen('''
%(marshal_output_call)s %(marshal_output_call)s
''', ''',
marshal_output_call=gen_marshal_output_call(name, ret_type)).rstrip() marshal_output_call=gen_marshal_output_call(name, ret_type)).rstrip()

17
scripts/qapi.py
View File

@ -943,15 +943,20 @@ def pop_indent(indent_amount=4):
global indent_level global indent_level
indent_level -= indent_amount indent_level -= indent_amount
# Generate @code with @kwds interpolated.
# Obey indent_level, and strip eatspace.
def cgen(code, **kwds): def cgen(code, **kwds):
indent = genindent(indent_level) raw = code % kwds
lines = code.split('\n') if indent_level:
lines = map(lambda x: indent + x, lines) indent = genindent(indent_level)
return '\n'.join(lines) % kwds + '\n' raw = re.subn("^.", indent + r'\g<0>', raw, 0, re.MULTILINE)
raw = raw[0]
return re.sub(re.escape(eatspace) + ' *', '', raw)
def mcgen(code, **kwds): def mcgen(code, **kwds):
raw = cgen('\n'.join(code.split('\n')[1:-1]), **kwds) if code[0] == '\n':
return re.sub(re.escape(eatspace) + ' *', '', raw) code = code[1:]
return cgen(code, **kwds)
def basename(filename): def basename(filename):
return filename.split("/")[-1] return filename.split("/")[-1]