[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 09/18] qapi/introspect.py: Introduce preliminary tree typing
From: |
Markus Armbruster |
Subject: |
[PATCH 09/18] qapi/introspect.py: Introduce preliminary tree typing |
Date: |
Fri, 19 Feb 2021 13:04:13 +0100 |
From: John Snow <jsnow@redhat.com>
The types will be used in forthcoming patches to add typing. These types
describe the layout and structure of the objects passed to
_tree_to_qlit, but lack the power to describe annotations until the next
commit.
Signed-off-by: John Snow <jsnow@redhat.com>
Message-Id: <20210216021809.134886-10-jsnow@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
scripts/qapi/introspect.py | 31 ++++++++++++++++++++++++++++++-
1 file changed, 30 insertions(+), 1 deletion(-)
diff --git a/scripts/qapi/introspect.py b/scripts/qapi/introspect.py
index 88af5383d5..c271006100 100644
--- a/scripts/qapi/introspect.py
+++ b/scripts/qapi/introspect.py
@@ -10,7 +10,13 @@
See the COPYING file in the top-level directory.
"""
-from typing import Optional
+from typing import (
+ Any,
+ Dict,
+ List,
+ Optional,
+ Union,
+)
from .common import (
c_name,
@@ -26,6 +32,29 @@
)
+# This module constructs a tree data structure that is used to
+# generate the introspection information for QEMU. It is shaped
+# like a JSON value.
+#
+# A complexity over JSON is that our values may or may not be annotated.
+#
+# Un-annotated values may be:
+# Scalar: str, bool, None.
+# Non-scalar: List, Dict
+# _value = Union[str, bool, None, Dict[str, JSONValue], List[JSONValue]]
+#
+# With optional annotations, the type of all values is:
+# JSONValue = Union[_Value, Annotated[_Value]]
+#
+# Sadly, mypy does not support recursive types; so the _Stub alias is used to
+# mark the imprecision in the type model where we'd otherwise use JSONValue.
+_Stub = Any
+_Scalar = Union[str, bool, None]
+_NonScalar = Union[Dict[str, _Stub], List[_Stub]]
+_Value = Union[_Scalar, _NonScalar]
+# JSONValue = TODO, in a forthcoming commit.
+
+
def _make_tree(obj, ifcond, comment=None):
extra = {
'if': ifcond,
--
2.26.2
- [PATCH 11/18] qapi/introspect.py: improve _tree_to_qlit error message, (continued)
- [PATCH 11/18] qapi/introspect.py: improve _tree_to_qlit error message, Markus Armbruster, 2021/02/19
- [PATCH 16/18] qapi/introspect.py: Update copyright and authors list, Markus Armbruster, 2021/02/19
- [PATCH 06/18] qapi/introspect.py: Unify return type of _make_tree(), Markus Armbruster, 2021/02/19
- [PATCH 13/18] qapi/introspect.py: remove _gen_variants helper, Markus Armbruster, 2021/02/19
- [PATCH 04/18] qapi/introspect.py: add _gen_features helper, Markus Armbruster, 2021/02/19
- [PATCH 10/18] qapi/introspect.py: create a typed 'Annotated' data strutcure, Markus Armbruster, 2021/02/19
- [PATCH 18/18] qapi/introspect.py: set _gen_tree's default ifcond argument to (), Markus Armbruster, 2021/02/19
- [PATCH 14/18] qapi/introspect.py: add type hint annotations, Markus Armbruster, 2021/02/19
- [PATCH 07/18] qapi/introspect.py: replace 'extra' dict with 'comment' argument, Markus Armbruster, 2021/02/19
- [PATCH 17/18] qapi/introspect.py: Type _gen_tree variants as Sequence[str], Markus Armbruster, 2021/02/19
- [PATCH 09/18] qapi/introspect.py: Introduce preliminary tree typing,
Markus Armbruster <=
- Re: [PATCH 00/18] QAPI patches patches for 2021-02-18, Markus Armbruster, 2021/02/19