yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-07-20 16:28:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

qapi: Generate in source order

Browse source 
The generators' conversion to visitors (merge commit 9e72681d16)
changed the processing order of entities from source order to
alphabetical order. The next commit needs source order, so change it
back.

Backports commit 8a84767cc4f7e00e5dd62435c32be9e7d2cbe4d3 from qemu
This commit is contained in:
Markus Armbruster 2018-03-09 09:00:10 -05:00 committed by Lioncash
parent cad1593b7d
commit 6fe71ebc68
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
qemu/scripts/qapi/common.py
View file

@ -1483,6 +1483,7 @@ class QAPISchema(object):
parser = QAPISchemaParser(open(fname, 'r')) parser = QAPISchemaParser(open(fname, 'r'))
exprs = check_exprs(parser.exprs) exprs = check_exprs(parser.exprs)
self.docs = parser.docs self.docs = parser.docs
self._entity_list = []
self._entity_dict = {} self._entity_dict = {}
self._predefining = True self._predefining = True
self._def_predefineds() self._def_predefineds()
@ -1494,6 +1495,7 @@ class QAPISchema(object):
# Only the predefined types are allowed to not have info # Only the predefined types are allowed to not have info
assert ent.info or self._predefining assert ent.info or self._predefining
assert ent.name not in self._entity_dict assert ent.name not in self._entity_dict
self._entity_list.append(ent)
self._entity_dict[ent.name] = ent self._entity_dict[ent.name] = ent
def lookup_entity(self, name, typ=None): def lookup_entity(self, name, typ=None):
@ -1692,12 +1694,12 @@ class QAPISchema(object):
assert False assert False
def check(self): def check(self):
for (name, ent) in sorted(self._entity_dict.items()): for ent in self._entity_list:
ent.check(self) ent.check(self)
def visit(self, visitor): def visit(self, visitor):
visitor.visit_begin(self) visitor.visit_begin(self)
for (name, entity) in sorted(self._entity_dict.items()): for entity in self._entity_list:
if visitor.visit_needed(entity): if visitor.visit_needed(entity):
entity.visit(visitor) entity.visit(visitor)
visitor.visit_end() visitor.visit_end()