motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-22 17:42:10 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

qapi: Section parameter @indent is no longer used, drop

Browse source 
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20230428105429.1687850-15-armbru@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
This commit is contained in:
Markus Armbruster 2023-04-28 12:54:26 +02:00
parent 08349786c8
commit eb59cf7628
1 changed files with 14 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

31
scripts/qapi/parser.py
View file

@ -468,8 +468,7 @@ class QAPIDoc:
class Section: class Section:
# pylint: disable=too-few-public-methods # pylint: disable=too-few-public-methods
def __init__(self, parser: QAPISchemaParser, def __init__(self, parser: QAPISchemaParser,
name: Optional[str] = None, indent: int = 0): name: Optional[str] = None):
# parser, for error messages about indentation # parser, for error messages about indentation
self._parser = parser self._parser = parser
# optional section name (argument/member or section name) # optional section name (argument/member or section name)
@ -500,8 +499,8 @@ class QAPIDoc:
class ArgSection(Section): class ArgSection(Section):
def __init__(self, parser: QAPISchemaParser, def __init__(self, parser: QAPISchemaParser,
name: str, indent: int = 0): name: str):
super().__init__(parser, name, indent) super().__init__(parser, name)
self.member: Optional['QAPISchemaMember'] = None self.member: Optional['QAPISchemaMember'] = None
def connect(self, member: 'QAPISchemaMember') -> None: def connect(self, member: 'QAPISchemaMember') -> None:
@ -627,7 +626,7 @@ class QAPIDoc:
match = self._match_at_name_colon(line) match = self._match_at_name_colon(line)
if match: if match:
line = line[match.end():] line = line[match.end():]
self._start_args_section(match.group(1), 0) self._start_args_section(match.group(1))
elif self._match_section_tag(line): elif self._match_section_tag(line):
self._append_line = self._append_various_line self._append_line = self._append_various_line
self._append_various_line(line) self._append_various_line(line)
@ -648,7 +647,7 @@ class QAPIDoc:
match = self._match_at_name_colon(line) match = self._match_at_name_colon(line)
if match: if match:
line = line[match.end():] line = line[match.end():]
self._start_features_section(match.group(1), 0) self._start_features_section(match.group(1))
elif self._match_section_tag(line): elif self._match_section_tag(line):
self._append_line = self._append_various_line self._append_line = self._append_various_line
self._append_various_line(line) self._append_various_line(line)
@ -681,15 +680,14 @@ class QAPIDoc:
match = self._match_section_tag(line) match = self._match_section_tag(line)
if match: if match:
line = line[match.end():] line = line[match.end():]
self._start_section(match.group(1), 0) self._start_section(match.group(1))
self._append_freeform(line) self._append_freeform(line)
def _start_symbol_section( def _start_symbol_section(
self, self,
symbols_dict: Dict[str, 'QAPIDoc.ArgSection'], symbols_dict: Dict[str, 'QAPIDoc.ArgSection'],
name: str, name: str) -> None:
indent: int) -> None:
# FIXME invalid names other than the empty string aren't flagged # FIXME invalid names other than the empty string aren't flagged
if not name: if not name:
raise QAPIParseError(self._parser, "invalid parameter name") raise QAPIParseError(self._parser, "invalid parameter name")
@ -697,22 +695,21 @@ class QAPIDoc:
raise QAPIParseError(self._parser, raise QAPIParseError(self._parser,
"'%s' parameter name duplicated" % name) "'%s' parameter name duplicated" % name)
assert not self.sections assert not self.sections
new_section = QAPIDoc.ArgSection(self._parser, name, indent) new_section = QAPIDoc.ArgSection(self._parser, name)
self._switch_section(new_section) self._switch_section(new_section)
symbols_dict[name] = new_section symbols_dict[name] = new_section
def _start_args_section(self, name: str, indent: int) -> None: def _start_args_section(self, name: str) -> None:
self._start_symbol_section(self.args, name, indent) self._start_symbol_section(self.args, name)
def _start_features_section(self, name: str, indent: int) -> None: def _start_features_section(self, name: str) -> None:
self._start_symbol_section(self.features, name, indent) self._start_symbol_section(self.features, name)
def _start_section(self, name: Optional[str] = None, def _start_section(self, name: Optional[str] = None) -> None:
indent: int = 0) -> None:
if name in ('Returns', 'Since') and self.has_section(name): if name in ('Returns', 'Since') and self.has_section(name):
raise QAPIParseError(self._parser, raise QAPIParseError(self._parser,
"duplicated '%s' section" % name) "duplicated '%s' section" % name)
new_section = QAPIDoc.Section(self._parser, name, indent) new_section = QAPIDoc.Section(self._parser, name)
self._switch_section(new_section) self._switch_section(new_section)
self.sections.append(new_section) self.sections.append(new_section)