From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37344) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WgCpd-0002hW-5k for qemu-devel@nongnu.org; Fri, 02 May 2014 08:44:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WgCpX-0001NC-KY for qemu-devel@nongnu.org; Fri, 02 May 2014 08:44:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33662) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WgCpX-0001My-Bd for qemu-devel@nongnu.org; Fri, 02 May 2014 08:44:43 -0400 From: Markus Armbruster Date: Fri, 2 May 2014 14:44:27 +0200 Message-Id: <1399034675-17844-6-git-send-email-armbru@redhat.com> In-Reply-To: <1399034675-17844-1-git-send-email-armbru@redhat.com> References: <1399034675-17844-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH 05/13] qapi-visit.py: Clean up confusing push_indent() / pop_indent() use List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mdroth@linux.vnet.ibm.com, lcapitulino@redhat.com, pbonzini@redhat.com, akong@redhat.com, vilanova@ac.upc.edu Changing implicit indentation in the middle of generating a block makes following the code being generated unnecessarily hard. Signed-off-by: Markus Armbruster --- 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