From nobody Mon Feb 9 19:07:55 2026 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=1619061808; cv=none; d=zohomail.com; s=zohoarc; b=aG6smHfDDfW9ihiSL/3orqeJl6nLR63gWj2yBbnJmJMPsqwPnmRfyqF90HzVxr4zL+utwdHP00BSqeq4hQn8+OUUljHxO1MMArAgvnYN66M2RZl0dJssTCa1h1ocegrH0JCrwOoYlYx5FDzNTYMvFWkv7zT2M2ZciAEKe0QffYk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619061808; 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=B4jp8cAAn1x1QPx55eEH2P8Gg4s33gFRJr6p0MqE0aw=; b=UAkHK6+TQyL5qOvZi3PY2JTNoi9FEROqepeISFk8Y3mXS6B6f+xO0qH2ULgmM0weL6vQ+3XRh1A9723o99Vac5wId/KiZitVdGQR6VE74e1dEALO2uW9Kb9nS9SY+3PfowtnyIZ5ks9WKxOQm4ozwFsfi4kads95D3xvF5iF+9M= 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 1619061808191629.4181806289323; Wed, 21 Apr 2021 20:23:28 -0700 (PDT) Received: from localhost ([::1]:47818 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lZPw6-0005gw-4N for importer@patchew.org; Wed, 21 Apr 2021 23:23:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49262) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lZPh2-0006dG-4X for qemu-devel@nongnu.org; Wed, 21 Apr 2021 23:07:52 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:50661) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lZPgr-0006VC-3d for qemu-devel@nongnu.org; Wed, 21 Apr 2021 23:07:51 -0400 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-392-6mmcbhxOMi28tE5k_tukAg-1; Wed, 21 Apr 2021 23:07:33 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0AF4F107ACC7; Thu, 22 Apr 2021 03:07:33 +0000 (UTC) Received: from scv.redhat.com (ovpn-118-152.rdu2.redhat.com [10.10.118.152]) by smtp.corp.redhat.com (Postfix) with ESMTP id 334EC607CB; Thu, 22 Apr 2021 03:07:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619060857; 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=B4jp8cAAn1x1QPx55eEH2P8Gg4s33gFRJr6p0MqE0aw=; b=UswRAuH3XOq5nOqRyDX+EBe0QdiT4gIKLaVwybvSiQbTzLOey5GYQUZdx+TyDkTsC2ePB9 B/etzfjjPCBiRUanBmnQdQAKoRfk0ppmIidjV0Smv7B8QaNKVgELD8anThdqs4/wyG/PSg cO9yD+p2EDFql7t+f3saaHjH9qBhlPM= X-MC-Unique: 6mmcbhxOMi28tE5k_tukAg-1 From: John Snow To: qemu-devel@nongnu.org Subject: [PATCH 13/22] qapi/parser: [RFC] overload the return type of get_expr Date: Wed, 21 Apr 2021 23:07:11 -0400 Message-Id: <20210422030720.3685766-14-jsnow@redhat.com> In-Reply-To: <20210422030720.3685766-1-jsnow@redhat.com> References: <20210422030720.3685766-1-jsnow@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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=170.10.133.124; envelope-from=jsnow@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, 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: Michael Roth , Cleber Rosa , John Snow , Markus Armbruster , Eduardo Habkost 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" Teach mypy that there are two possible return types here: either an Expression, or ... something else. Not a SLOC reduction, but it does remove an assertion. It also isn't much safer than a cast, mypy has no insight into if overloads are true or not. It's on the honor system. I thought I'd demonstrate its use, though. Signed-off-by: John Snow --- scripts/qapi/parser.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/scripts/qapi/parser.py b/scripts/qapi/parser.py index f2b57d5642a..cbdddc344e7 100644 --- a/scripts/qapi/parser.py +++ b/scripts/qapi/parser.py @@ -23,6 +23,7 @@ Optional, Set, Union, + overload, ) =20 from .common import match_nofail @@ -95,8 +96,7 @@ def _parse(self) -> None: self.docs.append(cur_doc) continue =20 - expr =3D self.get_expr(False) - assert isinstance(expr, dict) # Guaranteed when nested=3DFalse + expr =3D self.get_expr() =20 if 'include' in expr: self.reject_expr_doc(cur_doc) @@ -304,8 +304,15 @@ def get_values(self) -> List[object]: raise QAPIParseError(self, "expected ',' or ']'") self.accept() =20 + @overload + # No nesting, must be an Expression. + def get_expr(self) -> Expression: ... + + @overload + # Possibly nested, might be anything. + def get_expr(self, nested: bool) -> _ExprValue: ... + def get_expr(self, nested: bool =3D False) -> _ExprValue: - # TODO: Teach mypy that nested=3DFalse means the retval is a Dict. expr: _ExprValue if self.tok !=3D '{' and not nested: raise QAPIParseError(self, "expected '{'") --=20 2.30.2