[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v7 05/14] qapi: mcgen() shouldn't indent # lines
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH v7 05/14] qapi: mcgen() shouldn't indent # lines |
Date: |
Tue, 3 Jul 2018 17:56:39 +0200 |
Skip preprocessor lines when adding indentation, since that would
likely result in invalid code.
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
---
scripts/qapi/common.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/qapi/common.py b/scripts/qapi/common.py
index feae646e09..1b56065a80 100644
--- a/scripts/qapi/common.py
+++ b/scripts/qapi/common.py
@@ -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)
--
2.18.0.rc1
- [Qemu-devel] [PATCH v7 00/14] qapi: add #if pre-processor conditions to generated code (part 1), Marc-André Lureau, 2018/07/03
- [Qemu-devel] [PATCH v7 01/14] qapi: add 'if' to top-level expressions, Marc-André Lureau, 2018/07/03
- [Qemu-devel] [PATCH v7 02/14] qapi: pass 'if' condition into QAPISchemaEntity objects, Marc-André Lureau, 2018/07/03
- [Qemu-devel] [PATCH v7 05/14] qapi: mcgen() shouldn't indent # lines,
Marc-André Lureau <=
- [Qemu-devel] [PATCH v7 03/14] qapi: leave the ifcond attribute undefined until check(), Marc-André Lureau, 2018/07/03
- [Qemu-devel] [PATCH v7 04/14] qapi: add 'ifcond' to visitor methods, Marc-André Lureau, 2018/07/03
- [Qemu-devel] [PATCH v7 07/14] qapi-introspect: modify to_qlit() to append ', ' on level > 0, Marc-André Lureau, 2018/07/03
- [Qemu-devel] [PATCH v7 11/14] qapi-types: add #if conditions to types & visitors, Marc-André Lureau, 2018/07/03
- [Qemu-devel] [PATCH v7 10/14] qapi/events: add #if conditions to events, Marc-André Lureau, 2018/07/03
- [Qemu-devel] [PATCH v7 08/14] qapi-introspect: add preprocessor conditions to generated QLit, Marc-André Lureau, 2018/07/03
- [Qemu-devel] [PATCH v7 09/14] qapi/commands: add #if conditions to commands, Marc-André Lureau, 2018/07/03
- [Qemu-devel] [PATCH v7 06/14] qapi: add #if/#endif helpers, Marc-André Lureau, 2018/07/03