[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 14/17] qapi: Merge adjacent untagged sections
From: |
Markus Armbruster |
Subject: |
[PULL 14/17] qapi: Merge adjacent untagged sections |
Date: |
Mon, 26 Feb 2024 11:49:51 +0100 |
The parser mostly doesn't create adjacent untagged sections, and
merging the ones it does create is hardly worth the bother. I'm doing
it to avoid behavioral change in the next commit.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-ID: <20240216145841.2099240-14-armbru@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
---
scripts/qapi/parser.py | 3 +++
tests/qapi-schema/doc-empty-features.out | 2 --
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/scripts/qapi/parser.py b/scripts/qapi/parser.py
index de2ce3ec2c..48cc9a6367 100644
--- a/scripts/qapi/parser.py
+++ b/scripts/qapi/parser.py
@@ -719,6 +719,9 @@ def _start_features_section(self, name: str) -> None:
self._start_symbol_section(self.features, name)
def _start_section(self, tag: Optional[str] = None) -> None:
+ if not tag and not self._section.tag:
+ # extend current section
+ return
if tag in ('Returns', 'Since') and self.has_section(tag):
raise QAPIParseError(self._parser,
"duplicated '%s' section" % tag)
diff --git a/tests/qapi-schema/doc-empty-features.out
b/tests/qapi-schema/doc-empty-features.out
index 0f85623dde..473f59552d 100644
--- a/tests/qapi-schema/doc-empty-features.out
+++ b/tests/qapi-schema/doc-empty-features.out
@@ -14,6 +14,4 @@ command foo None -> None
gen=True success_response=True boxed=False oob=False preconfig=False
doc symbol=foo
body=
-
- section=None
not a description
--
2.43.0
- [PULL 00/17] QAPI patches patches for 2024-02-26, Markus Armbruster, 2024/02/26
- [PULL 14/17] qapi: Merge adjacent untagged sections,
Markus Armbruster <=
- [PULL 17/17] qapi: Divorce QAPIDoc from QAPIParseError, Markus Armbruster, 2024/02/26
- [PULL 12/17] qapi: Recognize section tags and 'Features:' only after blank line, Markus Armbruster, 2024/02/26
- [PULL 01/17] qapi: Misc cleanups to migrate QAPIs, Markus Armbruster, 2024/02/26
- [PULL 15/17] qapi: Rewrite doc comment parser, Markus Armbruster, 2024/02/26
- [PULL 02/17] tests/qapi-schema: Fix test 'QAPI rST doc', Markus Armbruster, 2024/02/26
- [PULL 09/17] qapi: Rename QAPIDoc.Section.name to .tag, Markus Armbruster, 2024/02/26
- [PULL 04/17] tests/qapi-schema: Cover 'Features:' not followed by descriptions, Markus Armbruster, 2024/02/26
- [PULL 05/17] sphinx/qapidoc: Drop code to generate doc for simple union branch, Markus Armbruster, 2024/02/26
- [PULL 16/17] qapi: Reject multiple and empty feature descriptions, Markus Armbruster, 2024/02/26
- [PULL 13/17] qapi: Call QAPIDoc.check() always, Markus Armbruster, 2024/02/26