motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-07-27 12:23:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

qapi: use './builtin' as the built-in module name

Browse source 
Use './builtin' as the built-in module name instead of
None. Clarify the typing that this is now always a string.

Signed-off-by: John Snow <jsnow@redhat.com>
Message-Id: <20210201193747.2169670-9-jsnow@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
John Snow 2021-02-01 14:37:39 -05:00 • committed by Markus Armbruster
parent 12893a8ea7
commit e2bbc4eaa7
10 changed files with 27 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

20
scripts/qapi/schema.py
View file

@ -68,7 +68,8 @@ class QAPISchemaEntity:
def _set_module(self, schema, info):
assert self._checked
self._module = schema.module_by_fname(info and info.fname)
fname = info.fname if info else './builtin'
self._module = schema.module_by_fname(fname)
self._module.add_entity(self)
def set_module(self, schema):
@ -142,16 +143,16 @@ class QAPISchemaModule:
self._entity_list = []
@staticmethod
def is_system_module(name: Optional[str]) -> bool:
def is_system_module(name: str) -> bool:
"""
System modules are internally defined modules.
Their names start with the "./" prefix.
"""
return name is None or name.startswith('./')
return name.startswith('./')
@classmethod
def is_user_module(cls, name: Optional[str]) -> bool:
def is_user_module(cls, name: str) -> bool:
"""
User modules are those defined by the user in qapi JSON files.
@ -160,13 +161,13 @@ class QAPISchemaModule:
return not cls.is_system_module(name)
@staticmethod
def is_builtin_module(name: Optional[str]) -> bool:
def is_builtin_module(name: str) -> bool:
"""
The built-in module is a single System module for the built-in types.
It is presently always the value 'None'.
It is always "./builtin".
"""
return name is None
return name == './builtin'
def add_entity(self, ent):
self._entity_list.append(ent)
@ -852,7 +853,7 @@ class QAPISchema:
self._entity_dict = {}
self._module_dict = OrderedDict()
self._schema_dir = os.path.dirname(fname)
self._make_module(None) # built-ins
self._make_module('./builtin')
self._make_module(fname)
self._predefining = True
self._def_predefineds()
@ -897,7 +898,7 @@ class QAPISchema:
info, "%s uses unknown type '%s'" % (what, name))
return typ
def _module_name(self, fname):
def _module_name(self, fname: str) -> str:
if QAPISchemaModule.is_system_module(fname):
return fname
return os.path.relpath(fname, self._schema_dir)
@ -910,7 +911,6 @@ class QAPISchema:
def module_by_fname(self, fname):
name = self._module_name(fname)
assert name in self._module_dict
return self._module_dict[name]
def _def_include(self, expr, info, doc):