From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id BD51FC2BA15 for ; Wed, 19 Jun 2024 12:04:45 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sJu3G-0004n9-OZ; Wed, 19 Jun 2024 08:04:36 -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 1sJu3D-0004jq-1W for qemu-devel@nongnu.org; Wed, 19 Jun 2024 08:04:31 -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 1sJu3B-00007s-J2 for qemu-devel@nongnu.org; Wed, 19 Jun 2024 08:04:30 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1718798668; 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: in-reply-to:in-reply-to:references:references; bh=c1YRsa5FMN7AVEVp7yQvFvKpZ4WKqcXzuoxdPtMilfo=; b=VnSrK+zFer6nS36kNy0kQiMNb8Mnl5JSMObTO92GwDCnXUyTesdJQFdfoiGPhDfZFW1TEh YMXwD4WaXsxgJcoUpwSDZlAeLsu8oI6i9pq5cdA90G/t5d5ShjNuoYDBkX2gj9h2+UzSHi reZJI4G5PSQZPdjKlNrfxqHmgcglynQ= Received: from mx-prod-mc-05.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-19-AODQnpT2NByhGbd5nQsmYA-1; Wed, 19 Jun 2024 08:04:25 -0400 X-MC-Unique: AODQnpT2NByhGbd5nQsmYA-1 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 280921956089; Wed, 19 Jun 2024 12:04:22 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.93]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id E864319560B2; Wed, 19 Jun 2024 12:04:20 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id A599E21E64CD; Wed, 19 Jun 2024 14:04:18 +0200 (CEST) From: Markus Armbruster To: John Snow Cc: qemu-devel@nongnu.org, Stefan Hajnoczi , Hanna Reitz , Michael Roth , Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= , Victor Toso de Carvalho , "Michael S. Tsirkin" , Konstantin Kostiuk , Yanan Wang , Pavel Dovgalyuk , =?utf-8?Q?Marc-Andr=C3=A9?= Lureau , Marcel Apfelbaum , Fabiano Rosas , Lukas Straub , Eduardo Habkost , Mads Ynddal , Daniel P. =?utf-8?Q?Berrang=C3=A9?= , Gerd Hoffmann , Stefan Berger , Peter Xu , Igor Mammedov , =?utf-8?Q?C=C3=A9dric?= Le Goater , Jason Wang , Ani Sinha , Paolo Bonzini , Peter Maydell , qemu-block@nongnu.org, Jiri Pirko , Alex Williamson , Kevin Wolf , Eric Blake Subject: Re: [PATCH 05/13] qapi/parser: fix comment parsing immediately following a doc block In-Reply-To: <20240619003012.1753577-6-jsnow@redhat.com> (John Snow's message of "Tue, 18 Jun 2024 20:30:04 -0400") References: <20240619003012.1753577-1-jsnow@redhat.com> <20240619003012.1753577-6-jsnow@redhat.com> Date: Wed, 19 Jun 2024 14:04:18 +0200 Message-ID: <8734p92l6l.fsf@pond.sub.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 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: 11 X-Spam_score: 1.1 X-Spam_bar: + X-Spam_report: (1.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.144, 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org John Snow writes: > If a comment immediately follows a doc block, the parser doesn't ignore > that token appropriately. Fix that. > > e.g. > >> ## >> # = Hello World! >> ## >> >> # I'm a comment! > > will break the parser, because it does not properly ignore the comment > token if it immediately follows a doc block. > > Fixes: 3d035cd2cca6 (qapi: Rewrite doc comment parser) > Signed-off-by: John Snow > --- > scripts/qapi/parser.py | 2 +- > tests/qapi-schema/doc-good.json | 2 ++ > 2 files changed, 3 insertions(+), 1 deletion(-) > > diff --git a/scripts/qapi/parser.py b/scripts/qapi/parser.py > index 43167ef0ab3..dfd6a6c5bee 100644 > --- a/scripts/qapi/parser.py > +++ b/scripts/qapi/parser.py > @@ -584,7 +584,7 @@ def get_doc(self) -> 'QAPIDoc': > line = self.get_doc_line() > first = False > > - self.accept(False) > + self.accept() > doc.end() > return doc > > diff --git a/tests/qapi-schema/doc-good.json b/tests/qapi-schema/doc-good.json > index de38a386e8f..8b39eb946af 100644 > --- a/tests/qapi-schema/doc-good.json > +++ b/tests/qapi-schema/doc-good.json > @@ -55,6 +55,8 @@ > # - {braces} > ## > > +# Not a doc comment > + > ## > # @Enum: > # Reviewed-by: Markus Armbruster