From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56392) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z3QIm-0003c7-5q for qemu-devel@nongnu.org; Fri, 12 Jun 2015 10:51:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z3QIh-0001iL-QL for qemu-devel@nongnu.org; Fri, 12 Jun 2015 10:51:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45851) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z3QIh-0001hu-L8 for qemu-devel@nongnu.org; Fri, 12 Jun 2015 10:51:19 -0400 From: Markus Armbruster Date: Fri, 12 Jun 2015 16:51:02 +0200 Message-Id: <1434120674-8122-5-git-send-email-armbru@redhat.com> In-Reply-To: <1434120674-8122-1-git-send-email-armbru@redhat.com> References: <1434120674-8122-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH 04/16] qapi: Eliminate superfluous QAPISchema attribute include_hist List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mdroth@linux.vnet.ibm.com Signed-off-by: Markus Armbruster --- scripts/qapi.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/qapi.py b/scripts/qapi.py index 683669e..baa60a5 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -110,7 +110,7 @@ class QAPISchema: if input_relname is None: input_relname = fp.name self.input_file = input_relname - self.include_hist = include_hist + [(input_relname, input_fname)] + include_hist = include_hist + [(input_relname, input_fname)] previously_included.append(input_fname) self.parent_info = parent_info self.src = fp.read() @@ -135,7 +135,7 @@ class QAPISchema: % include) include_path = os.path.join(os.path.dirname(input_fname), include) - for elem in self.include_hist: + for elem in include_hist: if include_path == elem[1]: raise QAPIExprError(expr_info, "Inclusion loop for %s" % include) @@ -147,7 +147,7 @@ class QAPISchema: except IOError, e: raise QAPIExprError(expr_info, '%s: %s' % (e.strerror, include)) - exprs_include = QAPISchema(fobj, include, self.include_hist, + exprs_include = QAPISchema(fobj, include, include_hist, previously_included, expr_info) self.exprs.extend(exprs_include.exprs) else: -- 1.9.3