From nobody Sun Oct 5 16:14:44 2025 Delivered-To: importer@patchew.org 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; 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1584013632; cv=none; d=zohomail.com; s=zohoarc; b=JKwgWnL0QjY/4HcPE3t7s0p5P+Zhg6Vv8VDt/DgIS1UV2+LGXBcrBPC1e5pcnjH0Da6h+Rptv9gSAKsjCookrEWJnPrIeSEJXy2oxbRbQQpQYx1rhWFMB/D858GQJNGsMSwWwgGItX78vdFCRzWrrambKTnbFyHsKaO3AFrNxt0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584013632; h=Content-Transfer-Encoding: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=8Ns4C0QWDYdgHc/0sLmGsAuNfWOgxN1irF3iygAMeMI=; b=ND0svQCmsGW/4v8eF5sbAqrOBREU3MPPsj57Ay3D1kCOfcW1yf8el0SIBCszoU/CkfkyxSF/g5Rg+T1leNp852rB2BUQqzqQs5Bhp3RlGECT7ijHS2228r/vAKST8DOtTB1ttGEmuG5BbpGB7xoGlN3jBqFwuaC7Equ1vA8vDRc= 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) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1584013632656534.3982389028802; Thu, 12 Mar 2020 04:47:12 -0700 (PDT) Received: from localhost ([::1]:39896 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jCMIx-0000QF-KC for importer@patchew.org; Thu, 12 Mar 2020 07:47:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58084) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jCMGA-0003Um-7d for qemu-devel@nongnu.org; Thu, 12 Mar 2020 07:44:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jCMG9-00022i-0I for qemu-devel@nongnu.org; Thu, 12 Mar 2020 07:44:18 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:35935) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jCMG8-00021q-QG for qemu-devel@nongnu.org; Thu, 12 Mar 2020 07:44:16 -0400 Received: by mail-wm1-x332.google.com with SMTP id g62so5922283wme.1 for ; Thu, 12 Mar 2020 04:44:16 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id p16sm2688564wmg.22.2020.03.12.04.44.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Mar 2020 04:44:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=8Ns4C0QWDYdgHc/0sLmGsAuNfWOgxN1irF3iygAMeMI=; b=vTmwaRAizjlAyPZa7dZRNHLHmiZsjReJpVJIRFds1SzfNHaT+S6khBsci5GqZKGJlM l3xrDMEDpkv3eNo3pYh7IbxDh10MoLNKrEDyRmtze9NIY+FQuw1FdV7qATCCn/NfKCep QcdC/ijeZI0VaSx+Fpk9W8XAXhm1eKqXiQxuLrLTz/vfeueIYjfHnQRS5TtEZKcaBkU4 J4zCzP5uQRJ0dylsfANex2CMIoFlZI4qOBnRkfwQTpjfu+gkXt5f5cwp6y9sN6l1j8M9 f2AaProS8mEOkMSd3YAT2HGH7vFiQr4CjruwzAUgwrnRgAwG9b/C9fd+lGgSZYH3iHZ0 7eiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8Ns4C0QWDYdgHc/0sLmGsAuNfWOgxN1irF3iygAMeMI=; b=bjmyUV1b8tR9RmjAGbeV+/Zud0C1692RVGw05g7/RxiDz6oVjBcuE78H/bT1jAelVJ C3xEfbyqP+AI1w05SAwK8bJabeLlMhVyWYPaC2/9RW/GRsk7+S+BzytiUGqIbJW1xibq Y3Jgyy7y4MRfv+fTnDUQ3iHWEdBvv3WUBk3wwsJgOU+tiWXQMhtYftFirWKqZY+faxQG D25NFgRPpPa7dwbDvdKSW4Nli2EPx+1j+pxfQS47v+/GvWGriCLPWwCtT1SnJ27JF9to kp7k4iTYBs0hl8yZ+0yyS8ye2NhkJ+uoEapF9WNx8tjUwgmFSR0nhNNz/3b0hGk5uL36 2zuA== X-Gm-Message-State: ANhLgQ1NqEfWx+dgP1qqA6zrEX7KSaQX5Q47+Uj0nAy6JdCQ/JAPmVpL gDuc2XOFqathXnbIbdUntK8dfcpUqvryJw== X-Google-Smtp-Source: ADFU+vtXdZKJwBQAbo685mkkT9Jfau7WPZugN4FA4ahIx9Ure4UQvbYHuNUuQrli1y0gQnMeySxjnQ== X-Received: by 2002:a1c:63c4:: with SMTP id x187mr4478014wmb.124.1584013455582; Thu, 12 Mar 2020 04:44:15 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 04/12] docs/sphinx/hxtool.py: Remove STEXI/ETEXI support Date: Thu, 12 Mar 2020 11:44:00 +0000 Message-Id: <20200312114408.16891-5-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200312114408.16891-1-peter.maydell@linaro.org> References: <20200312114408.16891-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::332 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" Now that none of our input .hx files have STEXI/ETEXI blocks, we can remove the code in the Sphinx hxtool extension that supported parsing them. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Message-id: 20200306171749.10756-5-peter.maydell@linaro.org --- docs/sphinx/hxtool.py | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/docs/sphinx/hxtool.py b/docs/sphinx/hxtool.py index 7dd223fe362..fb0649a3d5b 100644 --- a/docs/sphinx/hxtool.py +++ b/docs/sphinx/hxtool.py @@ -37,13 +37,11 @@ else: =20 __version__ =3D '1.0' =20 -# We parse hx files with a state machine which may be in one of three -# states: reading the C code fragment, inside a texi fragment, -# or inside a rST fragment. +# We parse hx files with a state machine which may be in one of two +# states: reading the C code fragment, or inside a rST fragment. class HxState(Enum): CTEXT =3D 1 - TEXI =3D 2 - RST =3D 3 + RST =3D 2 =20 def serror(file, lnum, errtext): """Raise an exception giving a user-friendly syntax error message""" @@ -110,31 +108,13 @@ class HxtoolDocDirective(Directive): =20 if directive =3D=3D 'HXCOMM': pass - elif directive =3D=3D 'STEXI': - if state =3D=3D HxState.RST: - serror(hxfile, lnum, 'expected ERST, found STEXI') - elif state =3D=3D HxState.TEXI: - serror(hxfile, lnum, 'expected ETEXI, found STEXI') - else: - state =3D HxState.TEXI - elif directive =3D=3D 'ETEXI': - if state =3D=3D HxState.RST: - serror(hxfile, lnum, 'expected ERST, found ETEXI') - elif state =3D=3D HxState.CTEXT: - serror(hxfile, lnum, 'expected STEXI, found ETEXI') - else: - state =3D HxState.CTEXT elif directive =3D=3D 'SRST': if state =3D=3D HxState.RST: serror(hxfile, lnum, 'expected ERST, found SRST') - elif state =3D=3D HxState.TEXI: - serror(hxfile, lnum, 'expected ETEXI, found SRST') else: state =3D HxState.RST elif directive =3D=3D 'ERST': - if state =3D=3D HxState.TEXI: - serror(hxfile, lnum, 'expected ETEXI, found ERST') - elif state =3D=3D HxState.CTEXT: + if state =3D=3D HxState.CTEXT: serror(hxfile, lnum, 'expected SRST, found ERST') else: state =3D HxState.CTEXT --=20 2.20.1