From nobody Tue Nov 18 09:21:16 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=1608324949; cv=none; d=zohomail.com; s=zohoarc; b=hye8mdG5uMMCWmX2Sh7RFbJS5behGgoUFUGLZnysxqzdFO9tpBh1QElqaBGIUXPvyfhBW9vGgHCFn3yN0zVbK+LU8K3aZ7vLGMNPf6wh3u6hNgnIHdt9i2X6rifMuWn0GT9IbOcVkSkRTtZagntnYS929bTvOOYuE3ydm25VmAs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1608324949; 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=f6a4QGjVjs5SeyjbcDfloJloXKqUKmBW0QyReCwbziA=; b=n0XCeJ8+QITuLg89iwtJua9VkqRo+nIQs0WAHku+EBYju8ivjLmye1YY477G0oY9l2iHgbhWXFekYngT/8Aad43ZknhZwlvzU0ghBZFxf/FrCgJy7xMlspR3sJOy60s7R6iOGV61XAMwyXV6DdyqHCf7PgLFiLLaKNxfLuhNaRg= 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 1608324949790384.1475523656926; Fri, 18 Dec 2020 12:55:49 -0800 (PST) Received: from localhost ([::1]:55506 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kqMmy-0002lh-LA for importer@patchew.org; Fri, 18 Dec 2020 15:55:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55572) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kqMlX-0000zR-Eh for qemu-devel@nongnu.org; Fri, 18 Dec 2020 15:54:19 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:50117) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kqMlU-0002u7-SU for qemu-devel@nongnu.org; Fri, 18 Dec 2020 15:54:19 -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-490-xz-HFr63Oe2SdcG3mL37Mw-1; Fri, 18 Dec 2020 15:54:14 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 83C5E10054FF for ; Fri, 18 Dec 2020 20:54:13 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-103.ams2.redhat.com [10.36.112.103]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8C73E299B4; Fri, 18 Dec 2020 20:54:09 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id D793211275D0; Fri, 18 Dec 2020 21:54:07 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1608324856; 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=f6a4QGjVjs5SeyjbcDfloJloXKqUKmBW0QyReCwbziA=; b=fFP9cbEl4ZLiJzoCzo4SJ9o4lYSaxU/5jH/OILzdkG7jUKLMBZaVkT+EnGNDd2qgyPC3e4 Q7a7gze2gz0arj2VIKDmNfFPH+A+U5h4dz7w+B5C/9T9j7nJX/548QYP7o4UC8hwljQ9XR r3vZp7UoJgyNn2Qxz0pnU8ISi/sfZ/I= X-MC-Unique: xz-HFr63Oe2SdcG3mL37Mw-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH 04/11] qapi/gen: assert that _start_if is not None in _wrap_ifcond Date: Fri, 18 Dec 2020 21:54:00 +0100 Message-Id: <20201218205407.1326907-5-armbru@redhat.com> In-Reply-To: <20201218205407.1326907-1-armbru@redhat.com> References: <20201218205407.1326907-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@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=armbru@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: marcandre.lureau@redhat.com, jsnow@redhat.com, ehabkost@redhat.com, crosa@redhat.com 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" From: John Snow 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 Message-Id: <20201217015927.197287-5-jsnow@redhat.com> --- 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 b40f18eee3..a6dc991b1d 100644 --- a/scripts/qapi/gen.py +++ b/scripts/qapi/gen.py @@ -130,11 +130,11 @@ class QAPIGenCCode(QAPIGen): 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