mirrors-yuzu-emu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn synced 2024-11-25 22:28:14 +00:00
Code Issues Projects Releases Packages 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

Backports commit 77e703b861d34bb2879f3e845482d5cf0a3a0ad1 from qemu
This commit is contained in:
Markus Armbruster 2018-02-19 16:04:34 -05:00 committed by Lioncash
parent 767e900547
commit e100831af9
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
qemu/scripts/qapi.py
View file

@ -942,15 +942,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):
raw = code % kwds
if indent_level:
indent = genindent(indent_level) indent = genindent(indent_level)
lines = code.split('\n') raw = re.subn("^.", indent + r'\g<0>', raw, 0, re.MULTILINE)
lines = map(lambda x: indent + x, lines) raw = raw[0]
return '\n'.join(lines) % kwds + '\n' 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]