qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: richard.henderson@linaro.org, Juan Quintela <quintela@redhat.com>
Subject: [PULL 14/17] qapi: Section parameter @indent is no longer used, drop
Date: Tue,  9 May 2023 10:00:08 +0200	[thread overview]
Message-ID: <20230509080011.3231661-15-armbru@redhat.com> (raw)
In-Reply-To: <20230509080011.3231661-1-armbru@redhat.com>

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20230428105429.1687850-15-armbru@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
---
 scripts/qapi/parser.py | 31 ++++++++++++++-----------------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/scripts/qapi/parser.py b/scripts/qapi/parser.py
index 3e29b7bf48..22ee631198 100644
--- a/scripts/qapi/parser.py
+++ b/scripts/qapi/parser.py
@@ -468,8 +468,7 @@ class QAPIDoc:
     class Section:
         # pylint: disable=too-few-public-methods
         def __init__(self, parser: QAPISchemaParser,
-                     name: Optional[str] = None, indent: int = 0):
-
+                     name: Optional[str] = None):
             # parser, for error messages about indentation
             self._parser = parser
             # optional section name (argument/member or section name)
@@ -500,8 +499,8 @@ def append(self, line: str) -> None:
 
     class ArgSection(Section):
         def __init__(self, parser: QAPISchemaParser,
-                     name: str, indent: int = 0):
-            super().__init__(parser, name, indent)
+                     name: str):
+            super().__init__(parser, name)
             self.member: Optional['QAPISchemaMember'] = None
 
         def connect(self, member: 'QAPISchemaMember') -> None:
@@ -626,7 +625,7 @@ def _append_args_line(self, line: str) -> None:
         """
         if match := self._match_at_name_colon(line):
             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):
             self._append_line = self._append_various_line
             self._append_various_line(line)
@@ -646,7 +645,7 @@ def _append_args_line(self, line: str) -> None:
     def _append_features_line(self, line: str) -> None:
         if match := self._match_at_name_colon(line):
             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):
             self._append_line = self._append_various_line
             self._append_various_line(line)
@@ -677,15 +676,14 @@ def _append_various_line(self, line: str) -> None:
                                  % (match.group(1), self.sections[0].name))
         if match := self._match_section_tag(line):
             line = line[match.end():]
-            self._start_section(match.group(1), 0)
+            self._start_section(match.group(1))
 
         self._append_freeform(line)
 
     def _start_symbol_section(
             self,
             symbols_dict: Dict[str, 'QAPIDoc.ArgSection'],
-            name: str,
-            indent: int) -> None:
+            name: str) -> None:
         # FIXME invalid names other than the empty string aren't flagged
         if not name:
             raise QAPIParseError(self._parser, "invalid parameter name")
@@ -693,22 +691,21 @@ def _start_symbol_section(
             raise QAPIParseError(self._parser,
                                  "'%s' parameter name duplicated" % name)
         assert not self.sections
-        new_section = QAPIDoc.ArgSection(self._parser, name, indent)
+        new_section = QAPIDoc.ArgSection(self._parser, name)
         self._switch_section(new_section)
         symbols_dict[name] = new_section
 
-    def _start_args_section(self, name: str, indent: int) -> None:
-        self._start_symbol_section(self.args, name, indent)
+    def _start_args_section(self, name: str) -> None:
+        self._start_symbol_section(self.args, name)
 
-    def _start_features_section(self, name: str, indent: int) -> None:
-        self._start_symbol_section(self.features, name, indent)
+    def _start_features_section(self, name: str) -> None:
+        self._start_symbol_section(self.features, name)
 
-    def _start_section(self, name: Optional[str] = None,
-                       indent: int = 0) -> None:
+    def _start_section(self, name: Optional[str] = None) -> None:
         if name in ('Returns', 'Since') and self.has_section(name):
             raise QAPIParseError(self._parser,
                                  "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.sections.append(new_section)
 
-- 
2.39.2



  parent reply	other threads:[~2023-05-09  8:05 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-05-09  7:59 [PULL 00/17] QAPI patches patches for 2023-05-09 Markus Armbruster
2023-05-09  7:59 ` [PULL 01/17] docs/devel/qapi-code-gen: Clean up use of quotes a bit Markus Armbruster
2023-05-09  7:59 ` [PULL 02/17] docs/devel/qapi-code-gen: Turn FIXME admonitions into comments Markus Armbruster
2023-05-09  7:59 ` [PULL 03/17] qapi: Fix crash on stray double quote character Markus Armbruster
2023-05-09  7:59 ` [PULL 04/17] meson: Fix to make QAPI generator output depend on main.py Markus Armbruster
2023-05-09  7:59 ` [PULL 05/17] Revert "qapi: BlockExportRemoveMode: move comments to TODO" Markus Armbruster
2023-05-09  8:00 ` [PULL 06/17] sphinx/qapidoc: Do not emit TODO sections into user manuals Markus Armbruster
2023-05-09  8:00 ` [PULL 07/17] qapi: Tidy up a slightly awkward TODO comment Markus Armbruster
2023-05-09  8:00 ` [PULL 08/17] qapi/dump: Indent bulleted lists consistently Markus Armbruster
2023-05-09  8:00 ` [PULL 09/17] tests/qapi-schema/doc-good: Improve a comment Markus Armbruster
2023-05-09  8:00 ` [PULL 10/17] tests/qapi-schema/doc-good: Improve argument description tests Markus Armbruster
2023-05-09  8:00 ` [PULL 11/17] qapi: Fix argument description indentation stripping Markus Armbruster
2023-05-09  8:00 ` [PULL 12/17] qapi: Rewrite parsing of doc comment section symbols and tags Markus Armbruster
2023-05-09  8:00 ` [PULL 13/17] qapi: Relax doc string @name: description indentation rules Markus Armbruster
2023-05-09  8:00 ` Markus Armbruster [this message]
2023-05-09  8:00 ` [PULL 15/17] docs/devel/qapi-code-gen: Update doc comment conventions Markus Armbruster
2023-05-09  8:00 ` [PULL 16/17] qga/qapi-schema: Reformat doc comments to conform to current conventions Markus Armbruster
2023-05-09  8:00 ` [PULL 17/17] qapi: " Markus Armbruster
2023-05-09 16:20 ` [PULL 00/17] QAPI patches patches for 2023-05-09 Richard Henderson
2023-05-09 17:13   ` Paolo Bonzini

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230509080011.3231661-15-armbru@redhat.com \
    --to=armbru@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=quintela@redhat.com \
    --cc=richard.henderson@linaro.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).