motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-07-29 05:13:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

qapi/parser: clarify _end_section() logic

Browse source 
The "if self._section" clause in end_section is mysterious: In which
circumstances might we end a section when we don't have one?

QAPIDoc always expects there to be a "current section", only except
after a call to end_comment(). This actually *shouldn't* ever be 'None',
so let's remove that logic so I don't wonder why it's like this again in
three months.

Signed-off-by: John Snow <jsnow@redhat.com>
Message-Id: <20210930205716.1148693-7-jsnow@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
John Snow 2021-09-30 16:57:09 -04:00 • committed by Markus Armbruster
parent cd87c14cde
commit 1e20a77576
1 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

22
scripts/qapi/parser.py
View file

@ -718,13 +718,21 @@ class QAPIDoc:
self.sections.append(self._section) self.sections.append(self._section)
def _end_section(self): def _end_section(self):
if self._section: assert self._section is not None
text = self._section.text = self._section.text.strip()
if self._section.name and (not text or text.isspace()): text = self._section.text = self._section.text.strip()
raise QAPIParseError(
self._parser, # Only the 'body' section is allowed to have an empty body.
"empty doc section '%s'" % self._section.name) # All other sections, including anonymous ones, must have text.
self._section = None if self._section != self.body and not text:
# We do not create anonymous sections unless there is
# something to put in them; this is a parser bug.
assert self._section.name
raise QAPIParseError(
self._parser,
"empty doc section '%s'" % self._section.name)
self._section = None
def _append_freeform(self, line): def _append_freeform(self, line):
match = re.match(r'(@\S+:)', line) match = re.match(r'(@\S+:)', line)