qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Marc-André Lureau" <marcandre.lureau@redhat.com>
To: qemu-devel@nongnu.org
Cc: armbru@redhat.com, "Marc-André Lureau" <marcandre.lureau@redhat.com>
Subject: [Qemu-devel] [PATCH v7 05/14] qapi: mcgen() shouldn't indent # lines
Date: Tue,  3 Jul 2018 17:56:39 +0200	[thread overview]
Message-ID: <20180703155648.11933-6-marcandre.lureau@redhat.com> (raw)
In-Reply-To: <20180703155648.11933-1-marcandre.lureau@redhat.com>

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

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
---
 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

  parent reply	other threads:[~2018-07-03 15:57 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-07-03 15:56 [Qemu-devel] [PATCH v7 00/14] qapi: add #if pre-processor conditions to generated code (part 1) Marc-André Lureau
2018-07-03 15:56 ` [Qemu-devel] [PATCH v7 01/14] qapi: add 'if' to top-level expressions Marc-André Lureau
2018-07-03 16:21   ` Markus Armbruster
2018-07-03 15:56 ` [Qemu-devel] [PATCH v7 02/14] qapi: pass 'if' condition into QAPISchemaEntity objects Marc-André Lureau
2018-07-03 15:56 ` [Qemu-devel] [PATCH v7 03/14] qapi: leave the ifcond attribute undefined until check() Marc-André Lureau
2018-07-03 15:56 ` [Qemu-devel] [PATCH v7 04/14] qapi: add 'ifcond' to visitor methods Marc-André Lureau
2018-07-03 16:22   ` Markus Armbruster
2018-07-03 15:56 ` Marc-André Lureau [this message]
2018-07-03 15:56 ` [Qemu-devel] [PATCH v7 06/14] qapi: add #if/#endif helpers Marc-André Lureau
2018-07-03 16:35   ` Markus Armbruster
2018-07-03 15:56 ` [Qemu-devel] [PATCH v7 07/14] qapi-introspect: modify to_qlit() to append ', ' on level > 0 Marc-André Lureau
2018-07-03 15:56 ` [Qemu-devel] [PATCH v7 08/14] qapi-introspect: add preprocessor conditions to generated QLit Marc-André Lureau
2018-07-03 15:56 ` [Qemu-devel] [PATCH v7 09/14] qapi/commands: add #if conditions to commands Marc-André Lureau
2018-07-03 16:36   ` Markus Armbruster
2018-07-03 15:56 ` [Qemu-devel] [PATCH v7 10/14] qapi/events: add #if conditions to events Marc-André Lureau
2018-07-03 15:56 ` [Qemu-devel] [PATCH v7 11/14] qapi-types: add #if conditions to types & visitors Marc-André Lureau
2018-07-03 15:56 ` [Qemu-devel] [PATCH v7 12/14] qapi: add 'If:' section to generated documentation Marc-André Lureau
2018-07-03 15:56 ` [Qemu-devel] [PATCH v7 13/14] qapi: add conditions to VNC type/commands/events on the schema Marc-André Lureau
2018-07-03 15:56 ` [Qemu-devel] [PATCH v7 14/14] qapi: add conditions to SPICE " Marc-André Lureau
2018-07-03 16:41 ` [Qemu-devel] [PATCH v7 00/14] qapi: add #if pre-processor conditions to generated code (part 1) Markus Armbruster

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180703155648.11933-6-marcandre.lureau@redhat.com \
    --to=marcandre.lureau@redhat.com \
    --cc=armbru@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).