From nobody Mon Feb 9 11:28:47 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=1612399070; cv=none; d=zohomail.com; s=zohoarc; b=NVowhymJT0LIRPNsduf1Ldgh0f175W9bWvfgKA+b4WZHMaiR+T6ttFUb+nMkxGv6BIpfEousqBXVS6FyBCKIqisyAEd5h1SahYOgIqvOqQGAR1zVeBDWuunBOFo5dnJxDnsv+1Z7nO6dZYHrXzDCxWz0iZupfSZLR7aFWerGnBE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612399070; 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=1SsbOm4FHH0XCOp+wutYMrVH+yv5sFpo6JYVyifERMA=; b=W/KqnGIdnpFFuoq0Cn6JeYFNYNFb1by4rv9ecvUufOc4VN9FRyRdwIDLKUMvY4pYLNp7HFvCtPbmQXa5pfqtfOPTl7T07Pd7WhOHmkXG+cOdrKmrVd7JZ6FgY0uI1LwQXZ9ZhBEYFyJb6eyIkH9X1CyUGoNQCLEIzlw6O4GRPYA= 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 1612399070463849.5468546295924; Wed, 3 Feb 2021 16:37:50 -0800 (PST) Received: from localhost ([::1]:45780 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l7Seb-0006zI-8N for importer@patchew.org; Wed, 03 Feb 2021 19:37:49 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56796) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l7SZQ-0001GJ-5Q for qemu-devel@nongnu.org; Wed, 03 Feb 2021 19:32:28 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:56093) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l7SZF-0000d7-Gd for qemu-devel@nongnu.org; Wed, 03 Feb 2021 19:32:27 -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-214-KFbLMwg9O0WT08nSIlobFg-1; Wed, 03 Feb 2021 19:32: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 6FF1D107ACF5 for ; Thu, 4 Feb 2021 00:32:14 +0000 (UTC) Received: from scv.redhat.com (ovpn-112-247.rdu2.redhat.com [10.10.112.247]) by smtp.corp.redhat.com (Postfix) with ESMTP id CEBEB1007622; Thu, 4 Feb 2021 00:32:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612398736; 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=1SsbOm4FHH0XCOp+wutYMrVH+yv5sFpo6JYVyifERMA=; b=BoDTVDqa7C4Z2E83Ns+f55F251pKvDYBei6kgBzU8Dg00mlxqrWZqNGvKO+sqWTczQJLvT sCPkNXrEKQXZwDwhyIBtQcZkLFA+4h+aWpnpsr9FkMN4ckAHt1zOf1jCDWfvzEK0OdBzii yg/LKVI7iRH6Ag86yLOpSBCvN+WOSXQ= X-MC-Unique: KFbLMwg9O0WT08nSIlobFg-1 From: John Snow To: Markus Armbruster , qemu-devel@nongnu.org Subject: [PATCH v5 08/15] qapi/introspect.py: Introduce preliminary tree typing Date: Wed, 3 Feb 2021 19:32:00 -0500 Message-Id: <20210204003207.2856909-9-jsnow@redhat.com> In-Reply-To: <20210204003207.2856909-1-jsnow@redhat.com> References: <20210204003207.2856909-1-jsnow@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=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: -32 X-Spam_score: -3.3 X-Spam_bar: --- X-Spam_report: (-3.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.539, 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: John Snow , Eduardo Habkost , Cleber Rosa 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" The types will be used in forthcoming patches to add typing. These types describe the layout and structure of the objects passed to _tree_to_qlit, but lack the power to describe annotations until the next commit. Signed-off-by: John Snow --- scripts/qapi/introspect.py | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/scripts/qapi/introspect.py b/scripts/qapi/introspect.py index 45231d2abc3..8e019b4a26a 100644 --- a/scripts/qapi/introspect.py +++ b/scripts/qapi/introspect.py @@ -10,7 +10,13 @@ See the COPYING file in the top-level directory. """ =20 -from typing import Optional +from typing import ( + Any, + Dict, + List, + Optional, + Union, +) =20 from .common import ( c_name, @@ -26,6 +32,28 @@ ) =20 =20 +# This module constructs a tree data structure that is used to +# generate the introspection information for QEMU. It behaves similarly +# to a JSON value. +# +# A complexity over JSON is that our values may or may not be annotated. +# +# Un-annotated values may be: +# Scalar: str, bool, None. +# Non-scalar: List, Dict +# _value =3D Union[str, bool, None, Dict[str, TreeValue], List[TreeValue]] +# +# With optional annotations, the type of all values is: +# TreeValue =3D Union[_value, Annotated[_value]] +# +# Sadly, mypy does not support recursive types, so we must approximate thi= s. +_stub =3D Any +_scalar =3D Union[str, bool, None] +_nonscalar =3D Union[Dict[str, _stub], List[_stub]] +_value =3D Union[_scalar, _nonscalar] +# TreeValue =3D TODO, in a forthcoming commit. + + def _make_tree(obj, ifcond, comment=3DNone): extra =3D { 'if': ifcond, --=20 2.29.2