From nobody Tue Nov 18 09:21:17 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=1608325098; cv=none; d=zohomail.com; s=zohoarc; b=lltfeUlklhJDjpYzCnzDT5ADW+i41x4/Iho8RoZnSF4R9hNydTbucT/4qNRF2jwwZU5tQGqS2ODHgEVzAQwbIfn7+KWGredOO+ubYRI9uFSsa6rzBeQBd7jxjvURMKWpCvK9BcdzJXmWWHK1wXaFeLkZsClg5uKJXj6OwGTjwVQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1608325098; 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=sYazpc3XYxcQWKauYYN3lkLQYH+gsX+5rD5UqYJiuQc=; b=Fa67WVRZIdJLWzk/LNjOV6LdH3TEaZ1dqLbgsq/IbiQkeLi5ncvr8b3bdM2ohsuMhmYu2g9p/rF6dr2QrVvmp8Nu88r1DEn8qcBSrggxaqmk8NtDf5UVtna+hZ2lkh3Gtckdgwh+kWJLrxmkoEcf1lhY3G7Ha+/tIb9k+fdyK6k= 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 1608325098592133.1364519883415; Fri, 18 Dec 2020 12:58:18 -0800 (PST) Received: from localhost ([::1]:34690 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kqMpM-0005tb-Q5 for importer@patchew.org; Fri, 18 Dec 2020 15:58:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55604) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kqMlY-00010q-Nt for qemu-devel@nongnu.org; Fri, 18 Dec 2020 15:54:20 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:40689) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kqMlW-0002ud-Cu for qemu-devel@nongnu.org; Fri, 18 Dec 2020 15:54:20 -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-445-8jQoGhR1Poyd2bcT73M40w-1; Fri, 18 Dec 2020 15:54:15 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D7CE9800D62 for ; Fri, 18 Dec 2020 20:54:14 +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 A41AD10013C0; Fri, 18 Dec 2020 20:54:14 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id DE2C811275DA; 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=1608324857; 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=sYazpc3XYxcQWKauYYN3lkLQYH+gsX+5rD5UqYJiuQc=; b=ctEQ4D7QImqmDKT8CyUfOyiAAL3jPQpOybOxXHVwnunkDrZTDsyBHyohdNNrutdp33Wfgj oR+U+xGfnoCxckjrlA+xlWoE585ONkuY2fY9ZJ1G8zzeCNXdntGx1NFn1F3MQsS7X9vZCv F37jMl/f1IjU41PWXQ5v5pVx1rQwr/k= X-MC-Unique: 8jQoGhR1Poyd2bcT73M40w-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH 06/11] qapi/gen: write _genc/_genh access shims Date: Fri, 18 Dec 2020 21:54:02 +0100 Message-Id: <20201218205407.1326907-7-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.22 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=216.205.24.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_H3=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 Many places assume they can access these fields without checking them first to ensure they are defined. Eliminating the _genc and _genh fields and replacing them with functional properties that check for correct state can ease the typing overhead by eliminating the Optional[T] return type. Signed-off-by: John Snow Message-Id: <20201217015927.197287-9-jsnow@redhat.com> --- scripts/qapi/gen.py | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/scripts/qapi/gen.py b/scripts/qapi/gen.py index 476d0adac4..12ea98fb61 100644 --- a/scripts/qapi/gen.py +++ b/scripts/qapi/gen.py @@ -243,11 +243,20 @@ class QAPISchemaModularCVisitor(QAPISchemaVisitor): self._user_blurb =3D user_blurb self._builtin_blurb =3D builtin_blurb self._pydoc =3D pydoc - self._genc: Optional[QAPIGenC] =3D None - self._genh: Optional[QAPIGenH] =3D None + self._current_module: Optional[str] =3D None self._module: Dict[str, Tuple[QAPIGenC, QAPIGenH]] =3D {} self._main_module: Optional[str] =3D None =20 + @property + def _genc(self) -> QAPIGenC: + assert self._current_module is not None + return self._module[self._current_module][0] + + @property + def _genh(self) -> QAPIGenH: + assert self._current_module is not None + return self._module[self._current_module][1] + @staticmethod def _is_user_module(name: str) -> bool: return not name.startswith('./') @@ -282,7 +291,7 @@ class QAPISchemaModularCVisitor(QAPISchemaVisitor): genc =3D QAPIGenC(basename + '.c', blurb, self._pydoc) genh =3D QAPIGenH(basename + '.h', blurb, self._pydoc) self._module[name] =3D (genc, genh) - self._genc, self._genh =3D self._module[name] + self._current_module =3D name =20 def _add_user_module(self, name: str, blurb: str) -> None: assert self._is_user_module(name) @@ -315,8 +324,7 @@ class QAPISchemaModularCVisitor(QAPISchemaVisitor): else: # The built-in module has not been created. No code may # be generated. - self._genc =3D None - self._genh =3D None + self._current_module =3D None else: self._add_user_module(name, self._user_blurb) self._begin_user_module(name) --=20 2.26.2