From nobody Fri Apr 4 21:14:26 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1741947107; cv=none; d=zohomail.com; s=zohoarc; b=R+i5ybufL8suWgPA/yK8d0Dupi4GbYr1IeRTqVuNkf6nta5gINI1KAriBQCEZ9kH8uT6xSXLNsZ0dDZhid1NIO7U71ZfG39i0b6j26r1EA9mUPOBBzWdyAbT3+vYRO/4D6DlXUa8Ai5lQqOGO8UZoUrvmvftbA1e7ZbImzIMzwQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1741947107; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=BJOvE7bX3CbiaJXP+Wn72i13qtqWhY5+bX0nNEwCku8=; b=G6ZQIc01hH22HfzU+tsrHAvGBZ6Q3lhjxA3X+6Jbh9j6Hpcsx7rV6/AW7F2sIWSLMmL9OuydXNpPDTUAfa5qaUD247znciHRRYgO4iMTfxU6BUZ4RqcFI0S4s1FvnIZE71jg3iF7jhG3GWo33OOQ1aTC2OfMtuL/qv6Is/JniHg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1741947107697226.43777931871034; Fri, 14 Mar 2025 03:11:47 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tt20L-0006KM-Tc; Fri, 14 Mar 2025 06:11:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tt20G-0006Iv-1F for qemu-devel@nongnu.org; Fri, 14 Mar 2025 06:10:56 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tt20C-00023R-SH for qemu-devel@nongnu.org; Fri, 14 Mar 2025 06:10:55 -0400 Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-219-Gi5cm--mNlmrsg8fDDYeLA-1; Fri, 14 Mar 2025 06:10:45 -0400 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id E935B19560B8 for ; Fri, 14 Mar 2025 10:10:44 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.22.74.4]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id E0EF2300376F for ; Fri, 14 Mar 2025 10:10:43 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id C257B21E66A3; Fri, 14 Mar 2025 11:10:38 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1741947051; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=BJOvE7bX3CbiaJXP+Wn72i13qtqWhY5+bX0nNEwCku8=; b=Z0DcZ6gO0g0YtkaqCZ25zLBJ2ApKS26yGLFGB5usSPtGNIcEJimXW47iS9Buluo0JX2k2b npUztyyq9mqskFxZFrJLfjFSaYz/xTS3vgIruCVE/zkIFEEheNxV5Mr7w2uuv+7xzoO67J IzYjEOlU/Drun0rnusflIMxnRPZeh90= X-MC-Unique: Gi5cm--mNlmrsg8fDDYeLA-1 X-Mimecast-MFC-AGG-ID: Gi5cm--mNlmrsg8fDDYeLA_1741947045 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, John Snow Subject: [PULL 03/12] docs/qapi-domain: always store fully qualified name in signode Date: Fri, 14 Mar 2025 11:10:29 +0100 Message-ID: <20250314101038.2408751-4-armbru@redhat.com> In-Reply-To: <20250314101038.2408751-1-armbru@redhat.com> References: <20250314101038.2408751-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 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.129.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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1741947109835019100 Content-Type: text/plain; charset="utf-8" From: John Snow Currently, only the definition name is stored in the tree metadata; but the node property is confusingly called "fullname". Rectify this by always storing the FQN in the tree metadata. ... While we're here, re-organize the code in preparation for namespace support to make it a bit easier to add additional components of the FQN. With this change, there is now extremely little code left that's taken directly from the Python domain :) Signed-off-by: John Snow Message-ID: <20250313044312.189276-3-jsnow@redhat.com> Acked-by: Markus Armbruster Signed-off-by: Markus Armbruster --- docs/sphinx/qapi_domain.py | 64 +++++++++++++++++++++++++------------- 1 file changed, 42 insertions(+), 22 deletions(-) diff --git a/docs/sphinx/qapi_domain.py b/docs/sphinx/qapi_domain.py index d52e7df7bc..6b23fc73ef 100644 --- a/docs/sphinx/qapi_domain.py +++ b/docs/sphinx/qapi_domain.py @@ -178,6 +178,25 @@ def get_index_text(self, name: Signature) -> Tuple[str= , str]: # NB: this is used for the global index, not the QAPI index. return ("single", f"{name} (QMP {self.objtype})") =20 + def _get_context(self) -> str: + modname =3D self.options.get( + "module", self.env.ref_context.get("qapi:module", "") + ) + assert isinstance(modname, str) + return modname + + def _get_fqn(self, name: Signature) -> str: + modname =3D self._get_context() + + # If we're documenting a module, don't include the module as + # part of the FQN; we ARE the module! + if self.objtype =3D=3D "module": + modname =3D "" + + if modname: + name =3D f"{modname}.{name}" + return name + def add_target_and_index( self, name: Signature, sig: str, signode: desc_signature ) -> None: @@ -187,14 +206,8 @@ def add_target_and_index( =20 assert self.objtype =20 - # If we're documenting a module, don't include the module as - # part of the FQN. - modname =3D "" - if self.objtype !=3D "module": - modname =3D self.options.get( - "module", self.env.ref_context.get("qapi:module") - ) - fullname =3D (modname + "." if modname else "") + name + if not (fullname :=3D signode.get("fullname", "")): + fullname =3D self._get_fqn(name) =20 node_id =3D make_id( self.env, self.state.document, self.objtype, fullname @@ -213,18 +226,21 @@ def add_target_and_index( (arity, indextext, node_id, "", None) ) =20 + @staticmethod + def split_fqn(name: str) -> Tuple[str, str]: + if "." in name: + module, name =3D name.split(".") + else: + module =3D "" + + return (module, name) + def _object_hierarchy_parts( self, sig_node: desc_signature ) -> Tuple[str, ...]: if "fullname" not in sig_node: return () - modname =3D sig_node.get("module") - fullname =3D sig_node["fullname"] - - if modname: - return (modname, *fullname.split(".")) - - return tuple(fullname.split(".")) + return self.split_fqn(sig_node["fullname"]) =20 def _toc_entry_name(self, sig_node: desc_signature) -> str: # This controls the name in the TOC and on the sidebar. @@ -235,13 +251,19 @@ def _toc_entry_name(self, sig_node: desc_signature) -= > str: return "" =20 config =3D self.env.app.config - *parents, name =3D toc_parts + modname, name =3D toc_parts + if config.toc_object_entries_show_parents =3D=3D "domain": - return sig_node.get("fullname", name) + ret =3D name + if modname and modname !=3D self.env.ref_context.get( + "qapi:module", "" + ): + ret =3D f"{modname}.{name}" + return ret if config.toc_object_entries_show_parents =3D=3D "hide": return name if config.toc_object_entries_show_parents =3D=3D "all": - return ".".join(parents + [name]) + return sig_node.get("fullname", name) return "" =20 =20 @@ -312,11 +334,9 @@ def handle_signature(self, sig: str, signode: desc_sig= nature) -> Signature: As such, the only argument here is "sig", which is just the QAPI definition name. """ - modname =3D self.options.get( - "module", self.env.ref_context.get("qapi:module") - ) + modname =3D self._get_context() =20 - signode["fullname"] =3D sig + signode["fullname"] =3D self._get_fqn(sig) signode["module"] =3D modname sig_prefix =3D self.get_signature_prefix() if sig_prefix: --=20 2.48.1