From nobody Tue Nov 18 07:23:52 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1607990226; cv=none; d=zohomail.com; s=zohoarc; b=kWd2gIfztobK07o4SXtYTvVW8RwxY6vsRovbywdlEX+aPEd9aHeD3Rob7Rs0iSOC640pySQ6mAwebrRj1/JhG4PP53fiC6Ek8oydUKqM0+6+5l5HU8zcYV+0h52tWx8Ua/Ly1Dsp1Do8ryoudakgrf836lHT28yvrm/OamzyLsw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607990226; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=BzwysPB6rJBtPSdp674bMPM34g2T/AXsb1hxa0ijq5w=; b=MC7T3q8htfZ25FrljgLKzfjVD/uL7YfQfpOSnomMWVPPxIdCwRPC20LkBzxhPMTtN7As7ROWe2lwZMgh8pc3Wh7H98ahuXW83Gey07fw6xYvxQjyMfMDttB2RoL/YT6LAj6LgjADVROEvk+CUlrQrVkLaJWhfPABVuR4A4QytMY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1607990226621996.7469408857506; Mon, 14 Dec 2020 15:57:06 -0800 (PST) Received: from localhost ([::1]:38856 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1koxiD-0007vc-EU for importer@patchew.org; Mon, 14 Dec 2020 18:57:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43662) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1koxf1-0003B4-Ju for qemu-devel@nongnu.org; Mon, 14 Dec 2020 18:53:47 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:55201) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1koxf0-0000tO-2G for qemu-devel@nongnu.org; Mon, 14 Dec 2020 18:53:47 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-584-IyEPKtL9OfGdReyOH18n6w-1; Mon, 14 Dec 2020 18:53:43 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1C82359 for ; Mon, 14 Dec 2020 23:53:43 +0000 (UTC) Received: from scv.redhat.com (ovpn-116-117.rdu2.redhat.com [10.10.116.117]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5D56813470; Mon, 14 Dec 2020 23:53:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607990025; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=BzwysPB6rJBtPSdp674bMPM34g2T/AXsb1hxa0ijq5w=; b=bLzMdcB5TOdzX1x6nZKxkTu7bErT/PgZssOMLdWWUjAzdC4CDg9ThRmmPgZlFKpklr1xKQ R8t1Bjx2JPz9F4Rn5hssKr3SFO05bJILE9UFyO1E2/viLeInr+IuDc3CZYvF0X1mS17pzL oRV8M11+6pBQjaIBN/yIDFMPREl5/xo= X-MC-Unique: IyEPKtL9OfGdReyOH18n6w-1 From: John Snow To: qemu-devel@nongnu.org Subject: [PATCH 04/12] qapi/gen: assert that _start_if is not None in _wrap_ifcond Date: Mon, 14 Dec 2020 18:53:19 -0500 Message-Id: <20201214235327.1007124-5-jsnow@redhat.com> In-Reply-To: <20201214235327.1007124-1-jsnow@redhat.com> References: <20201214235327.1007124-1-jsnow@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=jsnow@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=63.128.21.124; envelope-from=jsnow@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Cleber Rosa , John Snow , Eduardo Habkost , Markus Armbruster Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" We already assert this in end_if, but that's opaque to mypy. Do it in _wrap_ifcond instead. Same effect at runtime, but mypy can now infer the type in _wrap_ifcond's body. Signed-off-by: John Snow --- scripts/qapi/gen.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/qapi/gen.py b/scripts/qapi/gen.py index b40f18eee3cd..a6dc991b1d03 100644 --- a/scripts/qapi/gen.py +++ b/scripts/qapi/gen.py @@ -130,11 +130,11 @@ def start_if(self, ifcond: List[str]) -> None: self._start_if =3D (ifcond, self._body, self._preamble) =20 def end_if(self) -> None: - assert self._start_if self._wrap_ifcond() self._start_if =3D None =20 def _wrap_ifcond(self) -> None: + assert self._start_if self._body =3D _wrap_ifcond(self._start_if[0], self._start_if[1], self._body) self._preamble =3D _wrap_ifcond(self._start_if[0], --=20 2.26.2