From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org, John Snow <jsnow@redhat.com>
Subject: [PULL 08/13] qapi/parser: add import cycle workaround
Date: Sat, 2 Oct 2021 11:56:50 +0200 [thread overview]
Message-ID: <20211002095655.1944970-9-armbru@redhat.com> (raw)
In-Reply-To: <20211002095655.1944970-1-armbru@redhat.com>
From: John Snow <jsnow@redhat.com>
Adding static types causes a cycle in the QAPI generator:
[schema -> expr -> parser -> schema]. It exists because the QAPIDoc
class needs the names of types defined by the schema module, but the
schema module needs to import both expr.py/parser.py to do its actual
parsing.
Ultimately, the layering violation is that parser.py should not have any
knowledge of specifics of the Schema. QAPIDoc performs double-duty here
both as a parser *and* as a finalized object that is part of the schema.
In this patch, add the offending type hints alongside the workaround to
avoid the cycle becoming a problem at runtime. See
https://mypy.readthedocs.io/en/latest/runtime_troubles.html#import-cycles
for more information on this workaround technique.
I see three ultimate resolutions here:
(1) Just keep this patch and use the TYPE_CHECKING trick to eliminate
the cycle which is only present during static analysis.
(2) Don't bother to annotate connect_member() et al, give them 'object'
or 'Any'. I don't particularly like this, because it diminishes the
usefulness of type hints for documentation purposes. Still, it's an
extremely quick fix.
(3) Reimplement doc <--> definition correlation directly in schema.py,
integrating doc fields directly into QAPISchemaMember and relieving
the QAPIDoc class of the responsibility. Users of the information
would instead visit the members first and retrieve their
documentation instead of the inverse operation -- visiting the
documentation and retrieving their members.
My preference is (3), but in the short-term (1) is the easiest way to
have my cake (strong type hints) and eat it too (Not have import
cycles). Do (1) for now, but plan for (3).
Signed-off-by: John Snow <jsnow@redhat.com>
Message-Id: <20210930205716.1148693-9-jsnow@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
scripts/qapi/parser.py | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/scripts/qapi/parser.py b/scripts/qapi/parser.py
index 40c5da4b17..75582ddb00 100644
--- a/scripts/qapi/parser.py
+++ b/scripts/qapi/parser.py
@@ -18,6 +18,7 @@
import os
import re
from typing import (
+ TYPE_CHECKING,
Dict,
List,
Optional,
@@ -30,6 +31,12 @@
from .source import QAPISourceInfo
+if TYPE_CHECKING:
+ # pylint: disable=cyclic-import
+ # TODO: Remove cycle. [schema -> expr -> parser -> schema]
+ from .schema import QAPISchemaFeature, QAPISchemaMember
+
+
# Return value alias for get_expr().
_ExprValue = Union[List[object], Dict[str, object], str, bool]
@@ -473,9 +480,9 @@ def append(self, line):
class ArgSection(Section):
def __init__(self, parser, name, indent=0):
super().__init__(parser, name, indent)
- self.member = None
+ self.member: Optional['QAPISchemaMember'] = None
- def connect(self, member):
+ def connect(self, member: 'QAPISchemaMember') -> None:
self.member = member
class NullSection(Section):
@@ -747,14 +754,14 @@ def _append_freeform(self, line):
% match.group(1))
self._section.append(line)
- def connect_member(self, member):
+ def connect_member(self, member: 'QAPISchemaMember') -> None:
if member.name not in self.args:
# Undocumented TODO outlaw
self.args[member.name] = QAPIDoc.ArgSection(self._parser,
member.name)
self.args[member.name].connect(member)
- def connect_feature(self, feature):
+ def connect_feature(self, feature: 'QAPISchemaFeature') -> None:
if feature.name not in self.features:
raise QAPISemError(feature.info,
"feature '%s' lacks documentation"
--
2.31.1
next prev parent reply other threads:[~2021-10-02 10:07 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-02 9:56 [PULL 00/13] QAPI patches patches for 2021-10-02 Markus Armbruster
2021-10-02 9:56 ` [PULL 01/13] qapi/pylintrc: ignore 'consider-using-f-string' warning Markus Armbruster
2021-10-02 9:56 ` [PULL 02/13] qapi/gen: use dict.items() to iterate over _modules Markus Armbruster
2021-10-02 9:56 ` [PULL 03/13] qapi/parser: fix unused check_args_section arguments Markus Armbruster
2021-10-02 9:56 ` [PULL 04/13] qapi: Add spaces after symbol declaration for consistency Markus Armbruster
2021-10-02 9:56 ` [PULL 05/13] qapi/parser: remove FIXME comment from _append_body_line Markus Armbruster
2021-10-02 9:56 ` [PULL 06/13] qapi/parser: clarify _end_section() logic Markus Armbruster
2021-10-02 9:56 ` [PULL 07/13] qapi/parser: Introduce NullSection Markus Armbruster
2021-10-02 9:56 ` Markus Armbruster [this message]
2021-10-02 9:56 ` [PULL 09/13] qapi/parser: add type hint annotations (QAPIDoc) Markus Armbruster
2021-10-02 9:56 ` [PULL 10/13] qapi/parser: Add FIXME for consolidating JSON-related types Markus Armbruster
2021-10-02 9:56 ` [PULL 11/13] qapi/parser: enable mypy checks Markus Armbruster
2021-10-02 9:56 ` [PULL 12/13] qapi/parser: Silence too-few-public-methods warning Markus Armbruster
2021-10-02 9:56 ` [PULL 13/13] qapi/parser: enable pylint checks Markus Armbruster
2021-10-02 20:31 ` [PULL 00/13] QAPI patches patches for 2021-10-02 Richard Henderson
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=20211002095655.1944970-9-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=jsnow@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.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).