aboutsummaryrefslogtreecommitdiff
path: root/scripts/qapi/gen.py
diff options
context:
space:
mode:
authorJohn Snow <jsnow@redhat.com>2021-02-01 14:37:36 -0500
committerMarkus Armbruster <armbru@redhat.com>2021-02-08 14:15:58 +0100
commit98967c248c4c01085af2ff49ed3d378f79019902 (patch)
treeb22821aed3943dd1513b1586122d29e5e8f8c5e1 /scripts/qapi/gen.py
parenta253b3eb9a194a0b2e8b55095ce5f28c2d5cfa11 (diff)
downloadqemu-98967c248c4c01085af2ff49ed3d378f79019902.zip
qemu-98967c248c4c01085af2ff49ed3d378f79019902.tar.gz
qemu-98967c248c4c01085af2ff49ed3d378f79019902.tar.bz2
qapi: centralize is_[user|system|builtin]_module methods
Define what a module is and define what kind of a module it is once and for all, in one place. Signed-off-by: John Snow <jsnow@redhat.com> Message-Id: <20210201193747.2169670-6-jsnow@redhat.com> Reviewed-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Markus Armbruster <armbru@redhat.com>
Diffstat (limited to 'scripts/qapi/gen.py')
-rw-r--r--scripts/qapi/gen.py25
1 files changed, 11 insertions, 14 deletions
diff --git a/scripts/qapi/gen.py b/scripts/qapi/gen.py
index 3d81b90..2aec6d3 100644
--- a/scripts/qapi/gen.py
+++ b/scripts/qapi/gen.py
@@ -31,7 +31,11 @@ from .common import (
guardstart,
mcgen,
)
-from .schema import QAPISchemaObjectType, QAPISchemaVisitor
+from .schema import (
+ QAPISchemaModule,
+ QAPISchemaObjectType,
+ QAPISchemaVisitor,
+)
from .source import QAPISourceInfo
@@ -246,21 +250,14 @@ class QAPISchemaModularCVisitor(QAPISchemaVisitor):
self._main_module: Optional[str] = None
@staticmethod
- def _is_user_module(name: Optional[str]) -> bool:
- return bool(name and not name.startswith('./'))
-
- @staticmethod
- def _is_builtin_module(name: Optional[str]) -> bool:
- return not name
-
- def _module_dirname(self, name: Optional[str]) -> str:
- if self._is_user_module(name):
+ def _module_dirname(name: Optional[str]) -> str:
+ if QAPISchemaModule.is_user_module(name):
return os.path.dirname(name)
return ''
def _module_basename(self, what: str, name: Optional[str]) -> str:
- ret = '' if self._is_builtin_module(name) else self._prefix
- if self._is_user_module(name):
+ ret = '' if QAPISchemaModule.is_builtin_module(name) else self._prefix
+ if QAPISchemaModule.is_user_module(name):
basename = os.path.basename(name)
ret += what
if name != self._main_module:
@@ -282,7 +279,7 @@ class QAPISchemaModularCVisitor(QAPISchemaVisitor):
self._genc, self._genh = self._module[name]
def _add_user_module(self, name: str, blurb: str) -> None:
- assert self._is_user_module(name)
+ assert QAPISchemaModule.is_user_module(name)
if self._main_module is None:
self._main_module = name
self._add_module(name, blurb)
@@ -292,7 +289,7 @@ class QAPISchemaModularCVisitor(QAPISchemaVisitor):
def write(self, output_dir: str, opt_builtins: bool = False) -> None:
for name in self._module:
- if self._is_builtin_module(name) and not opt_builtins:
+ if QAPISchemaModule.is_builtin_module(name) and not opt_builtins:
continue
(genc, genh) = self._module[name]
genc.write(output_dir)