SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

qapi/parser: fix comment parsing immediately following a doc block

Browse Source 
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 <jsnow@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Message-ID: <20240626222128.406106-7-jsnow@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
John Snow 2024-06-26 18:21:12 -04:00 committed by Markus Armbruster
parent 939c639e1d
commit 83deda8769
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/qapi/parser.py
View File

@ -583,7 +583,7 @@ class QAPISchemaParser:
line = self.get_doc_line() line = self.get_doc_line()
first = False first = False
self.accept(False) self.accept()
doc.end() doc.end()
return doc return doc

2
tests/qapi-schema/doc-good.json
View File

@ -55,6 +55,8 @@
# - {braces} # - {braces}
## ##
# Not a doc comment
## ##
# @Enum: # @Enum:
# #