motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-07-27 12:23:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

qapi: Simplify representation of QAPIDoc section text

Browse source 
Use a string instead of a list of strings.

This makes qapi2texi.py generate additional blank lines.  They're
harmless, and the next commit will get rid of them again.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20171002141341.24616-9-armbru@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
This commit is contained in:
Markus Armbruster 2017-10-02 16:13:38 +02:00
parent fc3f0df187
commit 09331fced1
4 changed files with 17 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

16
scripts/qapi.py
View file

@ -106,13 +106,10 @@ class QAPIDoc(object):
# optional section name (argument/member or section name)
self.name = name
# the list of lines for this section
self.content = []
self.text = ''
def append(self, line):
self.content.append(line)
def __repr__(self):
return '\n'.join(self.content).strip()
self.text += line.rstrip() + '\n'
class ArgSection(Section):
def __init__(self, name):
@ -160,7 +157,7 @@ class QAPIDoc(object):
# recognized, and get silently treated as ordinary text
if self.symbol:
self._append_symbol_line(line)
elif not self.body.content and line.startswith('@'):
elif not self.body.text and line.startswith('@'):
if not line.endswith(':'):
raise QAPIParseError(self.parser, "Line should end with :")
self.symbol = line[1:-1]
@ -214,16 +211,15 @@ class QAPIDoc(object):
def _end_section(self):
if self.section:
contents = str(self.section)
if self.section.name and (not contents or contents.isspace()):
text = self.section.text = self.section.text.strip()
if self.section.name and (not text or text.isspace()):
raise QAPIParseError(self.parser, "Empty doc section '%s'"
% self.section.name)
self.section = None
def _append_freeform(self, line):
in_arg = isinstance(self.section, QAPIDoc.ArgSection)
if (in_arg and self.section.content
and not self.section.content[-1]
if (in_arg and self.section.text.endswith('\n\n')
and line and not line[0].isspace()):
self._start_section()
if (in_arg or not self.section.name