From nobody Fri Apr 4 03:24:55 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=1740368366; cv=none; d=zohomail.com; s=zohoarc; b=kJnkztirtKHBC+A1MndoJqTquwr89fy534xns0ZB3kfPl1PTTRRsijHTS+w8uQwNeUh1U9TeY1J5H7zQ+5/cQunFyq/06RK/iTF5Zp77bkDb2RTTATkF3D175nramIW6xduav8X2cbKlR5lB1MADVuRH2FQzMK7KpgVu2YT9F3w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1740368366; 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=7G6YVAL0iU98F5nK+nS2ppNms52d37aU3+2UhKmOzzI=; b=DAo1fMjj+a5+33wzsTwsggyaF27pXjVuab8W201QQOxuoCA1EQlVr7PaD6h5LkkG4kvvS0uLdRmYK1pQedNo8ULpRXfHi2ZaZumFrTsQywJ8YLa8IvxJLPJH+URo93rX83X1pWGliZAJfg9+4Ox5sZzI9ockW85QrRTpPp9B4pE= 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 1740368366941946.7562358505863; Sun, 23 Feb 2025 19:39:26 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tmPIo-0001hw-D9; Sun, 23 Feb 2025 22:38:43 -0500 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 1tmPIN-0001Q2-9G for qemu-devel@nongnu.org; Sun, 23 Feb 2025 22:38:15 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tmPIK-0005Rr-P6 for qemu-devel@nongnu.org; Sun, 23 Feb 2025 22:38:14 -0500 Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-294-CjF-6A1pMSGGNL7KsbCRFw-1; Sun, 23 Feb 2025 22:38:06 -0500 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C66CB18004A7; Mon, 24 Feb 2025 03:38:05 +0000 (UTC) Received: from jsnow-thinkpadp16vgen1.westford.csb (unknown [10.22.64.88]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 0192E19560A3; Mon, 24 Feb 2025 03:38:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1740368290; 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=7G6YVAL0iU98F5nK+nS2ppNms52d37aU3+2UhKmOzzI=; b=Hr7j5UAD2LEZ2+hZwT1CbgiM8B++8ryR6OZylZpjhSWvzKfx5s8upSI9xK3T0RJ6BR858r /1z8L5qCu/LSc4ACSUATWgwXwfTIOqVNq3Sm6VTNH5cLaWOn7zv2yI5Dmqpt2SrgedPh/u 7ikMML/XutMygYECDkCwB3z39+ZHiJU= X-MC-Unique: CjF-6A1pMSGGNL7KsbCRFw-1 X-Mimecast-MFC-AGG-ID: CjF-6A1pMSGGNL7KsbCRFw_1740368285 From: John Snow To: qemu-devel@nongnu.org Cc: Michael Roth , Thomas Huth , Peter Maydell , Markus Armbruster , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , John Snow , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH 09/10] qapi/source: allow multi-line QAPISourceInfo advancing Date: Sun, 23 Feb 2025 22:37:40 -0500 Message-ID: <20250224033741.222749-10-jsnow@redhat.com> In-Reply-To: <20250224033741.222749-1-jsnow@redhat.com> References: <20250224033741.222749-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 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: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.446, 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_H2=-0.01, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_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: 1740368367617019100 Content-Type: text/plain; charset="utf-8" This is for the sake of the new rST generator (the "transmogrifier") so we can advance multiple lines on occasion while keeping the generated<-->source mappings accurate. next_line now simply takes an optional n parameter which chooses the number of lines to advance. This is used mainly when converting section syntax in free-form documentation to more traditional rST section header syntax, which does not always line up 1:1 for line counts. For example: ``` ## # =3D Section <-- Info is pointing here, "L1" # # Lorem Ipsum ## ``` would be transformed to rST by the transmogrifier as: ``` =3D=3D=3D=3D=3D=3D=3D <-- L1 Section <-- L1 =3D=3D=3D=3D=3D=3D=3D <-- L1 <-- L2 Lorem Ipsum <-- L3 ``` With each line having its own source information credited to different source lines; sometimes one line to many. After consuming the single "Section" line from the source, we want to advance the source pointer to the next non-empty line which requires jumping by more than one line. ``` ## # =3D Section <-- Info is pointing here, "L1" # # Lorem Ipsum <-- We want to jump to here, +2. ## ``` Signed-off-by: John Snow Reviewed-by: Markus Armbruster --- scripts/qapi/source.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/qapi/source.py b/scripts/qapi/source.py index 7b379fdc925..ffdc3f482ac 100644 --- a/scripts/qapi/source.py +++ b/scripts/qapi/source.py @@ -47,9 +47,9 @@ def set_defn(self, meta: str, name: str) -> None: self.defn_meta =3D meta self.defn_name =3D name =20 - def next_line(self: T) -> T: + def next_line(self: T, n: int =3D 1) -> T: info =3D copy.copy(self) - info.line +=3D 1 + info.line +=3D n return info =20 def loc(self) -> str: --=20 2.48.1