diff options
| author | Eric Blake | 2015-12-02 06:20:49 +0100 |
|---|---|---|
| committer | Markus Armbruster | 2015-12-17 08:21:28 +0100 |
| commit | 0b2e84ba774651656771ed697dee8825759dffa9 (patch) | |
| tree | ee56eb1b6a6a9f5b73af64ed044e68968bfb995c | |
| parent | qapi: Simplify visiting of alternate types (diff) | |
| download | qemu-0b2e84ba774651656771ed697dee8825759dffa9.tar.gz qemu-0b2e84ba774651656771ed697dee8825759dffa9.tar.xz qemu-0b2e84ba774651656771ed697dee8825759dffa9.zip | |
qapi-types: Drop unnedeed ._fwdefn
Previously, the generated code in qapi-types.c initialized all
enum lookup tables first, prior to any other definitions. But
there are no topological sorting requirements that mandate this
layout, so we can drop the QAPISchemaGenTypeVisitor._fwdefn
field and just generate all definitions in visitation order.
The generated code shows some churn due to reordering, but it
is still fairly straightforward to follow (all the deletions
occur in one hunk, and all the deleted lines are re-inserted
in the same order later in the same files, just spread across
multiple insertion points).
Suggested-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1449033659-25497-6-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
| -rw-r--r-- | scripts/qapi-types.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/scripts/qapi-types.py b/scripts/qapi-types.py index 84ec858419..0d862698a4 100644 --- a/scripts/qapi-types.py +++ b/scripts/qapi-types.py @@ -168,21 +168,17 @@ class QAPISchemaGenTypeVisitor(QAPISchemaVisitor): self.decl = None self.defn = None self._fwdecl = None - self._fwdefn = None self._btin = None def visit_begin(self, schema): self.decl = '' self.defn = '' self._fwdecl = '' - self._fwdefn = '' self._btin = guardstart('QAPI_TYPES_BUILTIN') def visit_end(self): self.decl = self._fwdecl + self.decl self._fwdecl = None - self.defn = self._fwdefn + self.defn - self._fwdefn = None # To avoid header dependency hell, we always generate # declarations for built-in types in our header files and # simply guard them. See also do_builtins (command line @@ -209,7 +205,7 @@ class QAPISchemaGenTypeVisitor(QAPISchemaVisitor): self.defn += gen_enum_lookup(name, values, prefix) else: self._fwdecl += gen_enum(name, values, prefix) - self._fwdefn += gen_enum_lookup(name, values, prefix) + self.defn += gen_enum_lookup(name, values, prefix) def visit_array_type(self, name, info, element_type): if isinstance(element_type, QAPISchemaBuiltinType): |