Commit 485d948c authored by Marc-André Lureau's avatar Marc-André Lureau Committed by Markus Armbruster
Browse files

qapi: mcgen() shouldn't indent # lines 



Skip preprocessor lines when adding indentation, since that would
likely result in invalid code.

Signed-off-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
Message-Id: <20180703155648.11933-6-marcandre.lureau@redhat.com>
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
parent fbf09a2f

scripts/qapi/common.py

+2 −2
Original line number Diff line number Diff line
@@ -1941,8 +1941,8 @@ def cgen(code, **kwds): 
    if indent_level:

        indent = genindent(indent_level)

        # re.subn() lacks flags support before Python 2.7, use re.compile()

        raw = re.subn(re.compile(r'^.', re.MULTILINE),

                      indent + r'\g<0>', raw)

        raw = re.subn(re.compile(r'^(?!(#|$))', re.MULTILINE),

                      indent, raw)

        raw = raw[0]

    return re.sub(re.escape(eatspace) + r' *', '', raw)