From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55461) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z5Yss-0000Ko-AL for qemu-devel@nongnu.org; Thu, 18 Jun 2015 08:25:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z5Ysm-0007j7-4L for qemu-devel@nongnu.org; Thu, 18 Jun 2015 08:25:30 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33984) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z5Ysl-0007ia-VG for qemu-devel@nongnu.org; Thu, 18 Jun 2015 08:25:24 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (Postfix) with ESMTPS id A39572931F3 for ; Thu, 18 Jun 2015 12:25:23 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-36.ams2.redhat.com [10.36.116.36]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t5ICPLpW007513 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Thu, 18 Jun 2015 08:25:23 -0400 From: Markus Armbruster Date: Thu, 18 Jun 2015 14:25:09 +0200 Message-Id: <1434630318-22452-7-git-send-email-armbru@redhat.com> In-Reply-To: <1434630318-22452-1-git-send-email-armbru@redhat.com> References: <1434630318-22452-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PULL 06/15] qapi: Simplify inclusion cycle detection List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org We maintain a stack of filenames in include_hist for convenient cycle detection. As error_path() demonstrates, the same information is readily available in the expr_info, so just use that, and drop include_hist. Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake --- scripts/qapi.py | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/scripts/qapi.py b/scripts/qapi.py index 716e348..a24a7e2 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -101,15 +101,10 @@ class QAPIExprError(Exception): class QAPISchema: - def __init__(self, fp, include_hist = [], - previously_included = [], incl_info = None): - """ include_hist is a stack used to detect inclusion cycles - previously_included is a global state used to avoid multiple - inclusions of the same file""" + def __init__(self, fp, previously_included = [], incl_info = None): abs_fname = os.path.abspath(fp.name) fname = fp.name self.fname = fname - self.include_hist = include_hist + [(fname, abs_fname)] previously_included.append(abs_fname) self.incl_info = incl_info self.src = fp.read() @@ -135,10 +130,13 @@ class QAPISchema: % include) incl_abs_fname = os.path.join(os.path.dirname(abs_fname), include) - for elem in self.include_hist: - if incl_abs_fname == elem[1]: + # catch inclusion cycle + inf = expr_info + while inf: + if incl_abs_fname == os.path.abspath(inf['file']): raise QAPIExprError(expr_info, "Inclusion loop for %s" % include) + inf = inf['parent'] # skip multiple include of the same file if incl_abs_fname in previously_included: continue @@ -147,8 +145,8 @@ class QAPISchema: except IOError, e: raise QAPIExprError(expr_info, '%s: %s' % (e.strerror, include)) - exprs_include = QAPISchema(fobj, self.include_hist, - previously_included, expr_info) + exprs_include = QAPISchema(fobj, previously_included, + expr_info) self.exprs.extend(exprs_include.exprs) else: expr_elem = {'expr': expr, -- 1.9.3