From nobody Tue Jul 1 10:08:49 2025 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1621452232; cv=none; d=zohomail.com; s=zohoarc; b=jAhUnjdyrARUjiyCbp+AkrbgUhrGIppMJyhg5wvy+UpU6i5D9kV16VuEHvcpHJ71sToWHPTUp6OCwtiNq/5C2gAEGhtEIOXpe6sYQIWGEtUcJrn8nN/Cbj7yGCG3s4ZK2q3t+MHBeb+YfNfYtiGZlRPTpf6wg6Q/v2cUpAKYqpg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621452232; 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=XcLCBJp2GifzvxOzMbM4f59L5eLSU4faCfjRnldxOV4=; b=OXfjZa45sTWPWsLFglM++1fOQVyTWZAfl+6owNU+LCXF7b6lqVK50cU5ll3vZKLSzdLrr1mXJjesXwXWmleZ1KRBUmYHRl332Vp/PjhMqnh2VZNMsE6YOoQshJaUXkmF3yGDLjpOms9gABNk+f8OFKOXre06JsjhMn3OGDl8f1s= 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+importer2=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 1621452232700436.24652016718994; Wed, 19 May 2021 12:23:52 -0700 (PDT) Received: from localhost ([::1]:53292 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ljRnL-0004S0-Fg for importer2@patchew.org; Wed, 19 May 2021 15:23:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55310) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ljR78-00062s-PM for qemu-devel@nongnu.org; Wed, 19 May 2021 14:40:15 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:31570) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ljR6x-00020y-KB for qemu-devel@nongnu.org; Wed, 19 May 2021 14:40:14 -0400 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-414-MpV5hP4wM_yT575qcpcLQA-1; Wed, 19 May 2021 14:39:57 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 378F3501ED; Wed, 19 May 2021 18:39:56 +0000 (UTC) Received: from scv.redhat.com (ovpn-117-64.rdu2.redhat.com [10.10.117.64]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6FC6A59443; Wed, 19 May 2021 18:39:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1621449602; 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=XcLCBJp2GifzvxOzMbM4f59L5eLSU4faCfjRnldxOV4=; b=E9K5JHnjW0kljBHHoTT7prS5WVpYhyq7+XjcE1ds/TXGmpiibbRAtjb1va9oO6Sz9krK/C TqyEvCIRXt2kA3iSbWvEZuJ2WwD2SPBn3a4BJGVtvEYf9K+forLVmvDSbPt3EfB5vrdJw5 upp8aRTZzfyLVYbq1+wiy41Ln3vxmEg= X-MC-Unique: MpV5hP4wM_yT575qcpcLQA-1 From: John Snow To: qemu-devel@nongnu.org Subject: [PATCH v3 03/15] qapi/source: Remove line number from QAPISourceInfo initializer Date: Wed, 19 May 2021 14:39:39 -0400 Message-Id: <20210519183951.3946870-4-jsnow@redhat.com> In-Reply-To: <20210519183951.3946870-1-jsnow@redhat.com> References: <20210519183951.3946870-1-jsnow@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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+importer2=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: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.39, 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: Michael Roth , Cleber Rosa , John Snow , Eduardo Habkost , Markus Armbruster Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" With the QAPISourceInfo(None, None, None) construct gone, there's no longer any reason to have to specify that a file starts on the first line. Remove it from the initializer and default it to 1. Remove the last vestiges where we check for 'line' being unset, that can't happen, now. Signed-off-by: John Snow --- scripts/qapi/parser.py | 2 +- scripts/qapi/source.py | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/scripts/qapi/parser.py b/scripts/qapi/parser.py index a53b735e7de..39dbcc4eacc 100644 --- a/scripts/qapi/parser.py +++ b/scripts/qapi/parser.py @@ -47,7 +47,7 @@ def __init__(self, fname, previously_included=3DNone, inc= l_info=3DNone): if self.src =3D=3D '' or self.src[-1] !=3D '\n': self.src +=3D '\n' self.cursor =3D 0 - self.info =3D QAPISourceInfo(fname, 1, incl_info) + self.info =3D QAPISourceInfo(fname, incl_info) self.line_pos =3D 0 self.exprs =3D [] self.docs =3D [] diff --git a/scripts/qapi/source.py b/scripts/qapi/source.py index 1ade864d7b9..04193cc9643 100644 --- a/scripts/qapi/source.py +++ b/scripts/qapi/source.py @@ -31,10 +31,9 @@ def __init__(self) -> None: class QAPISourceInfo: T =3D TypeVar('T', bound=3D'QAPISourceInfo') =20 - def __init__(self, fname: str, line: int, - parent: Optional['QAPISourceInfo']): + def __init__(self, fname: str, parent: Optional['QAPISourceInfo']): self.fname =3D fname - self.line =3D line + self.line =3D 1 self.parent =3D parent self.pragma: QAPISchemaPragma =3D ( parent.pragma if parent else QAPISchemaPragma() @@ -52,10 +51,7 @@ def next_line(self: T) -> T: return info =20 def loc(self) -> str: - ret =3D self.fname - if self.line is not None: - ret +=3D ':%d' % self.line - return ret + return f"{self.fname}:{self.line}" =20 def in_defn(self) -> str: if self.defn_name: --=20 2.30.2