yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-06-22 14:37:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

qapi: rename QAPISchemaEnumType.values to .members

Browse source 
Rename QAPISchemaEnumType.values and related variables to members.
Makes sense ever since commit 93bda4dd4 changed .values from list of
string to list of QAPISchemaMember. Obvious no-op.

Backports commit 57516863644817ca59fab023e0c68d139929f3e0 from qemu
This commit is contained in:
Marc-André Lureau 2018-12-18 05:00:25 -05:00 committed by Lioncash
parent 8f69c83634
commit 5998dbcd67
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1173,22 +1173,22 @@ class QAPISchemaBuiltinType(QAPISchemaType):
class QAPISchemaEnumType(QAPISchemaType): class QAPISchemaEnumType(QAPISchemaType):
def __init__(self, name, info, doc, ifcond, values, prefix): def __init__(self, name, info, doc, ifcond, members, prefix):
QAPISchemaType.__init__(self, name, info, doc, ifcond) QAPISchemaType.__init__(self, name, info, doc, ifcond)
for v in values: for m in members:
assert isinstance(v, QAPISchemaMember) assert isinstance(m, QAPISchemaMember)
v.set_owner(name) m.set_owner(name)
assert prefix is None or isinstance(prefix, str) assert prefix is None or isinstance(prefix, str)
self.values = values self.members = members
self.prefix = prefix self.prefix = prefix
def check(self, schema): def check(self, schema):
QAPISchemaType.check(self, schema) QAPISchemaType.check(self, schema)
seen = {} seen = {}
for v in self.values: for m in self.members:
v.check_clash(self.info, seen) m.check_clash(self.info, seen)
if self.doc: if self.doc:
self.doc.connect_member(v) self.doc.connect_member(m)
def is_implicit(self): def is_implicit(self):
# See QAPISchema._make_implicit_enum_type() and ._def_predefineds() # See QAPISchema._make_implicit_enum_type() and ._def_predefineds()
@ -1198,7 +1198,7 @@ class QAPISchemaEnumType(QAPISchemaType):
return c_name(self.name) return c_name(self.name)
def member_names(self): def member_names(self):
return [v.name for v in self.values] return [m.name for m in self.members]
def json_type(self): def json_type(self):
return 'string' return 'string'
@ -1415,9 +1415,9 @@ class QAPISchemaObjectTypeVariants(object):
if self._tag_name: # flat union if self._tag_name: # flat union
# branches that are not explicitly covered get an empty type # branches that are not explicitly covered get an empty type
cases = set([v.name for v in self.variants]) cases = set([v.name for v in self.variants])
for val in self.tag_member.type.values: for m in self.tag_member.type.members:
if val.name not in cases: if m.name not in cases:
v = QAPISchemaObjectTypeVariant(val.name, 'q_empty') v = QAPISchemaObjectTypeVariant(m.name, 'q_empty')
v.set_owner(self.tag_member.owner) v.set_owner(self.tag_member.owner)
self.variants.append(v) self.variants.append(v)
for v in self.variants: for v in self.variants: