[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 06/16] qapi/gen: Replace ._begin_system_module()
From: |
John Snow |
Subject: |
[PATCH v4 06/16] qapi/gen: Replace ._begin_system_module() |
Date: |
Mon, 1 Feb 2021 14:37:37 -0500 |
From: Markus Armbruster <armbru@redhat.com>
QAPISchemaModularCVisitor._begin_system_module() is actually just for
the builtin module. Rename it to ._begin_builtin_module() and drop
its useless @name parameter.
Clarify conditionals in visit_module to make this clear.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: John Snow <jsnow@redhat.com>
---
scripts/qapi/gen.py | 9 +++++----
scripts/qapi/types.py | 2 +-
scripts/qapi/visit.py | 2 +-
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/scripts/qapi/gen.py b/scripts/qapi/gen.py
index 2aec6d34365..aaed78eed5e 100644
--- a/scripts/qapi/gen.py
+++ b/scripts/qapi/gen.py
@@ -295,23 +295,24 @@ def write(self, output_dir: str, opt_builtins: bool =
False) -> None:
genc.write(output_dir)
genh.write(output_dir)
- def _begin_system_module(self, name: None) -> None:
+ def _begin_builtin_module(self) -> None:
pass
def _begin_user_module(self, name: str) -> None:
pass
def visit_module(self, name: Optional[str]) -> None:
- if name is None:
+ if QAPISchemaModule.is_builtin_module(name):
if self._builtin_blurb:
- self._add_system_module(None, self._builtin_blurb)
- self._begin_system_module(name)
+ self._add_system_module(name, self._builtin_blurb)
+ self._begin_builtin_module()
else:
# The built-in module has not been created. No code may
# be generated.
self._genc = None
self._genh = None
else:
+ assert QAPISchemaModule.is_user_module(name)
self._add_user_module(name, self._user_blurb)
self._begin_user_module(name)
diff --git a/scripts/qapi/types.py b/scripts/qapi/types.py
index 2b4916cdaa1..dbf58c0b91d 100644
--- a/scripts/qapi/types.py
+++ b/scripts/qapi/types.py
@@ -271,7 +271,7 @@ def __init__(self, prefix: str):
prefix, 'qapi-types', ' * Schema-defined QAPI types',
' * Built-in QAPI types', __doc__)
- def _begin_system_module(self, name: None) -> None:
+ def _begin_builtin_module(self) -> None:
self._genc.preamble_add(mcgen('''
#include "qemu/osdep.h"
#include "qapi/dealloc-visitor.h"
diff --git a/scripts/qapi/visit.py b/scripts/qapi/visit.py
index 339f1521524..568ba35592c 100644
--- a/scripts/qapi/visit.py
+++ b/scripts/qapi/visit.py
@@ -305,7 +305,7 @@ def __init__(self, prefix: str):
prefix, 'qapi-visit', ' * Schema-defined QAPI visitors',
' * Built-in QAPI visitors', __doc__)
- def _begin_system_module(self, name: None) -> None:
+ def _begin_builtin_module(self) -> None:
self._genc.preamble_add(mcgen('''
#include "qemu/osdep.h"
#include "qapi/error.h"
--
2.29.2
- [PATCH v4 00/16] qapi: static typing conversion, pt1.5, John Snow, 2021/02/01
- [PATCH v4 04/16] qapi/gen: inline _wrap_ifcond into end_if(), John Snow, 2021/02/01
- [PATCH v4 03/16] qapi/main: handle theoretical None-return from re.match(), John Snow, 2021/02/01
- [PATCH v4 02/16] qapi/events: fix visit_event typing, John Snow, 2021/02/01
- [PATCH v4 01/16] qapi/commands: assert arg_type is not None, John Snow, 2021/02/01
- [PATCH v4 06/16] qapi/gen: Replace ._begin_system_module(),
John Snow <=
- [PATCH v4 07/16] qapi: use explicitly internal module names, John Snow, 2021/02/01
- [PATCH v4 10/16] qapi: centralize the built-in module name definition, John Snow, 2021/02/01
- [PATCH v4 09/16] qapi/gen: Combine ._add_[user|system]_module, John Snow, 2021/02/01
- [PATCH v4 12/16] qapi/gen: Support for switching to another module temporarily, John Snow, 2021/02/01
- [PATCH v4 11/16] qapi/gen: write _genc/_genh access shims, John Snow, 2021/02/01
- [PATCH v4 13/16] qapi/commands: Simplify command registry generation, John Snow, 2021/02/01
- [PATCH v4 14/16] qapi/gen: Drop support for QAPIGen without a file name, John Snow, 2021/02/01