[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 10/16] qapi: centralize the built-in module name definition
From: |
Markus Armbruster |
Subject: |
[PULL 10/16] qapi: centralize the built-in module name definition |
Date: |
Mon, 8 Feb 2021 14:58:40 +0100 |
From: John Snow <jsnow@redhat.com>
Use a constant to make it obvious we're referring to a very specific thing.
Signed-off-by: John Snow <jsnow@redhat.com>
Message-Id: <20210201193747.2169670-11-jsnow@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
scripts/qapi/schema.py | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/scripts/qapi/schema.py b/scripts/qapi/schema.py
index 14cf9da784..353e8020a2 100644
--- a/scripts/qapi/schema.py
+++ b/scripts/qapi/schema.py
@@ -68,7 +68,7 @@ class QAPISchemaEntity:
def _set_module(self, schema, info):
assert self._checked
- fname = info.fname if info else './builtin'
+ fname = info.fname if info else QAPISchemaModule.BUILTIN_MODULE_NAME
self._module = schema.module_by_fname(fname)
self._module.add_entity(self)
@@ -138,6 +138,9 @@ class QAPISchemaVisitor:
class QAPISchemaModule:
+
+ BUILTIN_MODULE_NAME = './builtin'
+
def __init__(self, name):
self.name = name
self._entity_list = []
@@ -160,14 +163,14 @@ class QAPISchemaModule:
"""
return not cls.is_system_module(name)
- @staticmethod
- def is_builtin_module(name: str) -> bool:
+ @classmethod
+ def is_builtin_module(cls, name: str) -> bool:
"""
The built-in module is a single System module for the built-in types.
It is always "./builtin".
"""
- return name == './builtin'
+ return name == cls.BUILTIN_MODULE_NAME
def add_entity(self, ent):
self._entity_list.append(ent)
@@ -853,7 +856,7 @@ class QAPISchema:
self._entity_dict = {}
self._module_dict = OrderedDict()
self._schema_dir = os.path.dirname(fname)
- self._make_module('./builtin')
+ self._make_module(QAPISchemaModule.BUILTIN_MODULE_NAME)
self._make_module(fname)
self._predefining = True
self._def_predefineds()
--
2.26.2
- [PULL 12/16] qapi/gen: Support switching to another module temporarily, (continued)
- [PULL 12/16] qapi/gen: Support switching to another module temporarily, Markus Armbruster, 2021/02/08
- [PULL 01/16] qapi/commands: assert arg_type is not None, Markus Armbruster, 2021/02/08
- [PULL 13/16] qapi/commands: Simplify command registry generation, Markus Armbruster, 2021/02/08
- [PULL 07/16] qapi: use explicitly internal module names, Markus Armbruster, 2021/02/08
- [PULL 03/16] qapi/main: handle theoretical None-return from re.match(), Markus Armbruster, 2021/02/08
- [PULL 06/16] qapi/gen: Replace ._begin_system_module(), Markus Armbruster, 2021/02/08
- [PULL 05/16] qapi: centralize is_[user|system|builtin]_module methods, Markus Armbruster, 2021/02/08
- [PULL 16/16] qapi: enable strict-optional checks, Markus Armbruster, 2021/02/08
- [PULL 11/16] qapi/gen: write _genc/_genh access shims, Markus Armbruster, 2021/02/08
- [PULL 15/16] qapi: type 'info' as Optional[QAPISourceInfo], Markus Armbruster, 2021/02/08
- [PULL 10/16] qapi: centralize the built-in module name definition,
Markus Armbruster <=
- [PULL 14/16] qapi/gen: Drop support for QAPIGen without a file name, Markus Armbruster, 2021/02/08
- [PULL 09/16] qapi/gen: Combine ._add_[user|system]_module, Markus Armbruster, 2021/02/08
- [PULL 08/16] qapi: use './builtin' as the built-in module name, Markus Armbruster, 2021/02/08
- Re: [PULL 00/16] QAPI patches patches for 2021-02-08, Peter Maydell, 2021/02/08