[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 05/12] qapi-visit.py: Clean up confusing push_ind
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v2 05/12] qapi-visit.py: Clean up confusing push_indent() / pop_indent() use |
Date: |
Wed, 7 May 2014 09:53:47 +0200 |
Changing implicit indentation in the middle of generating a block
makes following the code being generated unnecessarily hard.
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
scripts/qapi-visit.py | 32 ++++++++++++++------------------
1 file changed, 14 insertions(+), 18 deletions(-)
diff --git a/scripts/qapi-visit.py b/scripts/qapi-visit.py
index b38d62e..3eeb435 100644
--- a/scripts/qapi-visit.py
+++ b/scripts/qapi-visit.py
@@ -128,12 +128,14 @@ if (!err) {
''',
name=full_name)
+ ret += mcgen('''
+ /* Always call end_struct if start_struct succeeded. */
+ visit_end_struct(m, &err);
+}
+error_propagate(errp, err);
+''')
pop_indent()
ret += mcgen('''
- /* Always call end_struct if start_struct succeeded. */
- visit_end_struct(m, &err);
- }
- error_propagate(errp, err);
}
''')
return ret
@@ -289,19 +291,15 @@ void visit_type_%(name)s(Visitor *m, %(name)s ** obj,
const char *name, Error **
''',
name=name)
-
- push_indent()
push_indent()
push_indent()
if base:
ret += mcgen('''
- visit_type_%(name)s_fields(m, obj, &err);
+ visit_type_%(name)s_fields(m, obj, &err);
''',
name=name)
- pop_indent()
-
if not discriminator:
disc_key = "type"
else:
@@ -343,19 +341,17 @@ void visit_type_%(name)s(Visitor *m, %(name)s ** obj,
const char *name, Error **
}
error_propagate(errp, err);
err = NULL;
- }
''')
pop_indent()
- ret += mcgen('''
- /* Always call end_struct if start_struct succeeded. */
- visit_end_struct(m, &err);
- }
- error_propagate(errp, err);
-}
-''')
+ pop_indent()
- pop_indent();
ret += mcgen('''
+ }
+ /* Always call end_struct if start_struct succeeded. */
+ visit_end_struct(m, &err);
+ }
+ error_propagate(errp, err);
+ }
}
''')
--
1.8.1.4
- [Qemu-devel] [PATCH v2 00/12] qapi: Purge error_is_set(), Markus Armbruster, 2014/05/07
- [Qemu-devel] [PATCH v2 01/12] qapi: Update qapi-code-gen.txt example to match current code, Markus Armbruster, 2014/05/07
- [Qemu-devel] [PATCH v2 03/12] qapi: Remove unused Visitor callbacks start_handle(), end_handle(), Markus Armbruster, 2014/05/07
- [Qemu-devel] [PATCH v2 05/12] qapi-visit.py: Clean up confusing push_indent() / pop_indent() use,
Markus Armbruster <=
- [Qemu-devel] [PATCH v2 02/12] qapi: Normalize marshalling's visitor initialization and cleanup, Markus Armbruster, 2014/05/07
- [Qemu-devel] [PATCH v2 07/12] qapi-visit.py: Clean up a sloppy use of field prefix, Markus Armbruster, 2014/05/07
- [Qemu-devel] [PATCH v2 04/12] qapi: Replace start_optional()/end_optional() by optional(), Markus Armbruster, 2014/05/07
- [Qemu-devel] [PATCH v2 12/12] qapi: Replace uncommon use of the error API by the common one, Markus Armbruster, 2014/05/07
- [Qemu-devel] [PATCH v2 11/12] tests: Don't call visit_end_struct() after visit_start_struct() fails, Markus Armbruster, 2014/05/07
- [Qemu-devel] [PATCH v2 06/12] qapi: Clean up shadowing of parameters and locals in inner scopes, Markus Armbruster, 2014/05/07
- [Qemu-devel] [PATCH v2 08/12] qapi: Un-inline visit of implicit struct, Markus Armbruster, 2014/05/07
- [Qemu-devel] [PATCH v2 10/12] hw: Don't call visit_end_struct() after visit_start_struct() fails, Markus Armbruster, 2014/05/07
- [Qemu-devel] [PATCH v2 09/12] hmp: Call visit_end_struct() after visit_start_struct() succeeds, Markus Armbruster, 2014/05/07
- Re: [Qemu-devel] [PATCH v2 00/12] qapi: Purge error_is_set(), Luiz Capitulino, 2014/05/15