[v1] qapi: add #if pre-processor conditions to generated code

[Qemu-devel] [PATCH 06/26] qapi2texi: minor python code simplification

Posted by Marc-André Lureau 8 years, 6 months ago

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 scripts/qapi2texi.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/scripts/qapi2texi.py b/scripts/qapi2texi.py
index 9e015002ef..639eb1d042 100755
--- a/scripts/qapi2texi.py
+++ b/scripts/qapi2texi.py
@@ -136,10 +136,9 @@ def texi_enum_value(value):
 def texi_member(member, suffix=''):
     """Format a table of members item for an object type member"""
     typ = member.type.doc_type()
-    return '@item @code{%s%s%s}%s%s\n' % (
+    return '@item @code{%s%s}%s%s\n' % (
         member.name,
-        ': ' if typ else '',
-        typ if typ else '',
+        ': %s' % typ if typ else '',
         ' (optional)' if member.optional else '',
         suffix)
 
-- 
2.14.0.rc0.1.g40ca67566

Re: [Qemu-devel] [PATCH 06/26] qapi2texi: minor python code simplification

Posted by Markus Armbruster 8 years, 5 months ago

Marc-André Lureau <marcandre.lureau@redhat.com> writes:

> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
>  scripts/qapi2texi.py | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/scripts/qapi2texi.py b/scripts/qapi2texi.py
> index 9e015002ef..639eb1d042 100755
> --- a/scripts/qapi2texi.py
> +++ b/scripts/qapi2texi.py
> @@ -136,10 +136,9 @@ def texi_enum_value(value):
>  def texi_member(member, suffix=''):
>      """Format a table of members item for an object type member"""
>      typ = member.type.doc_type()
> -    return '@item @code{%s%s%s}%s%s\n' % (
> +    return '@item @code{%s%s}%s%s\n' % (
>          member.name,
> -        ': ' if typ else '',
> -        typ if typ else '',
> +        ': %s' % typ if typ else '',
>          ' (optional)' if member.optional else '',
>          suffix)

Is nested interpolation really simpler?