Message ID | 20180321115211.17937-17-marcandre.lureau@redhat.com |
---|---|
State | New |
Headers | show |
Series | qapi: add #if pre-processor conditions to generated code | expand |
Marc-André Lureau <marcandre.lureau@redhat.com> writes: > 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. > > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> I agree with renaming @values to @members where it's a list of QAPISchemaMembers. > --- > scripts/qapi/common.py | 36 +++++++++++++++++----------------- > scripts/qapi/doc.py | 2 +- > scripts/qapi/introspect.py | 4 ++-- > scripts/qapi/types.py | 6 +++--- > scripts/qapi/visit.py | 2 +- > tests/qapi-schema/test-qapi.py | 4 ++-- > 6 files changed, 27 insertions(+), 27 deletions(-) > > diff --git a/scripts/qapi/common.py b/scripts/qapi/common.py > index 68a567f53f..ea5cdfe3be 100644 > --- a/scripts/qapi/common.py > +++ b/scripts/qapi/common.py > @@ -1068,7 +1068,7 @@ class QAPISchemaVisitor(object): > def visit_builtin_type(self, name, info, json_type): > pass > > - def visit_enum_type(self, name, info, ifcond, values, prefix): > + def visit_enum_type(self, name, info, ifcond, members, prefix): This one is still a list of strings. The next patch changes it to list of QAPISchemaMembers, and that's when it should be renamed. > pass > > def visit_array_type(self, name, info, ifcond, element_type): > @@ -1166,22 +1166,22 @@ class QAPISchemaBuiltinType(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) > - for v in values: > - assert isinstance(v, QAPISchemaMember) > - v.set_owner(name) > + for m in members: > + assert isinstance(m, QAPISchemaMember) > + m.set_owner(name) > assert prefix is None or isinstance(prefix, str) > - self.values = values > + self.members = members > self.prefix = prefix > > def check(self, schema): > QAPISchemaType.check(self, schema) > seen = {} > - for v in self.values: > - v.check_clash(self.info, seen) > + for m in self.members: > + m.check_clash(self.info, seen) > if self.doc: > - self.doc.connect_member(v) > + self.doc.connect_member(m) > > def is_implicit(self): > # See QAPISchema._make_implicit_enum_type() and ._def_predefineds() > @@ -1191,7 +1191,7 @@ class QAPISchemaEnumType(QAPISchemaType): > return c_name(self.name) > > def member_names(self): > - return [v.name for v in self.values] > + return [m.name for m in self.members] > > def json_type(self): > return 'string' > @@ -1999,19 +1999,19 @@ def wrap_ifcond(ifcond, before, after): > return out > > > -def gen_enum_lookup(name, values, prefix=None): > +def gen_enum_lookup(name, members, prefix=None): Likewise. > ret = mcgen(''' > > const QEnumLookup %(c_name)s_lookup = { > .array = (const char *const[]) { > ''', > c_name=c_name(name)) > - for value in values: > - index = c_enum_const(name, value, prefix) > + for m in members: > + index = c_enum_const(name, m, prefix) > ret += mcgen(''' > [%(index)s] = "%(value)s", > ''', > - index=index, value=value) > + index=index, value=m) > > ret += mcgen(''' > }, > @@ -2022,9 +2022,9 @@ const QEnumLookup %(c_name)s_lookup = { > return ret > > > -def gen_enum(name, values, prefix=None): > +def gen_enum(name, members, prefix=None): Likewise. > # append automatically generated _MAX value > - enum_values = values + ['_MAX'] > + enum_members = members + ['_MAX'] > > ret = mcgen(''' > > @@ -2032,11 +2032,11 @@ typedef enum %(c_name)s { > ''', > c_name=c_name(name)) > > - for value in enum_values: > + for m in enum_members: > ret += mcgen(''' > %(c_enum)s, > ''', > - c_enum=c_enum_const(name, value, prefix)) > + c_enum=c_enum_const(name, m, prefix)) > > ret += mcgen(''' > } %(c_name)s; > diff --git a/scripts/qapi/doc.py b/scripts/qapi/doc.py > index d5cfd2336b..6c2bf98e1d 100755 > --- a/scripts/qapi/doc.py > +++ b/scripts/qapi/doc.py > @@ -204,7 +204,7 @@ class QAPISchemaGenDocVisitor(qapi.common.QAPISchemaVisitor): > def write(self, output_dir): > self._gen.write(output_dir, self._prefix + 'qapi-doc.texi') > > - def visit_enum_type(self, name, info, ifcond, values, prefix): > + def visit_enum_type(self, name, info, ifcond, members, prefix): > doc = self.cur_doc > self._gen.add(TYPE_FMT(type='Enum', > name=doc.symbol, Likewise. More of the same below. > diff --git a/scripts/qapi/introspect.py b/scripts/qapi/introspect.py > index cb4825f134..66f7fd00a9 100644 > --- a/scripts/qapi/introspect.py > +++ b/scripts/qapi/introspect.py > @@ -163,8 +163,8 @@ const QLitObject %(c_name)s = %(c_string)s; > def visit_builtin_type(self, name, info, json_type): > self._gen_qlit(name, 'builtin', {'json-type': json_type}, []) > > - def visit_enum_type(self, name, info, ifcond, values, prefix): > - self._gen_qlit(name, 'enum', {'values': values}, ifcond) > + def visit_enum_type(self, name, info, ifcond, members, prefix): > + self._gen_qlit(name, 'enum', {'values': members}, ifcond) > > def visit_array_type(self, name, info, ifcond, element_type): > element = self._use_type(element_type) > diff --git a/scripts/qapi/types.py b/scripts/qapi/types.py > index ce4c91206c..5b790cb41d 100644 > --- a/scripts/qapi/types.py > +++ b/scripts/qapi/types.py > @@ -213,10 +213,10 @@ class QAPISchemaGenTypeVisitor(QAPISchemaModularCVisitor): > self._genh.add(gen_type_cleanup_decl(name)) > self._genc.add(gen_type_cleanup(name)) > > - def visit_enum_type(self, name, info, ifcond, values, prefix): > + def visit_enum_type(self, name, info, ifcond, members, prefix): > with ifcontext(ifcond, self._genh, self._genc): > - self._genh.preamble_add(gen_enum(name, values, prefix)) > - self._genc.add(gen_enum_lookup(name, values, prefix)) > + self._genh.preamble_add(gen_enum(name, members, prefix)) > + self._genc.add(gen_enum_lookup(name, members, prefix)) > > def visit_array_type(self, name, info, ifcond, element_type): > with ifcontext(ifcond, self._genh): > diff --git a/scripts/qapi/visit.py b/scripts/qapi/visit.py > index e4a62ce030..ee776386ae 100644 > --- a/scripts/qapi/visit.py > +++ b/scripts/qapi/visit.py > @@ -301,7 +301,7 @@ class QAPISchemaGenVisitVisitor(QAPISchemaModularCVisitor): > ''', > types=types)) > > - def visit_enum_type(self, name, info, ifcond, values, prefix): > + def visit_enum_type(self, name, info, ifcond, members, prefix): > with ifcontext(ifcond, self._genh, self._genc): > self._genh.add(gen_visit_decl(name, scalar=True)) > self._genc.add(gen_visit_enum(name)) > diff --git a/tests/qapi-schema/test-qapi.py b/tests/qapi-schema/test-qapi.py > index 6d25a37dda..f4b8feb9bc 100644 > --- a/tests/qapi-schema/test-qapi.py > +++ b/tests/qapi-schema/test-qapi.py > @@ -23,8 +23,8 @@ class QAPISchemaTestVisitor(QAPISchemaVisitor): > def visit_include(self, name, info): > print('include %s' % name) > > - def visit_enum_type(self, name, info, ifcond, values, prefix): > - print('enum %s %s' % (name, values)) > + def visit_enum_type(self, name, info, ifcond, members, prefix): > + print('enum %s %s' % (name, members)) > if prefix: > print(' prefix %s' % prefix) > self._print_if(ifcond)
diff --git a/scripts/qapi/common.py b/scripts/qapi/common.py index 68a567f53f..ea5cdfe3be 100644 --- a/scripts/qapi/common.py +++ b/scripts/qapi/common.py @@ -1068,7 +1068,7 @@ class QAPISchemaVisitor(object): def visit_builtin_type(self, name, info, json_type): pass - def visit_enum_type(self, name, info, ifcond, values, prefix): + def visit_enum_type(self, name, info, ifcond, members, prefix): pass def visit_array_type(self, name, info, ifcond, element_type): @@ -1166,22 +1166,22 @@ class QAPISchemaBuiltinType(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) - for v in values: - assert isinstance(v, QAPISchemaMember) - v.set_owner(name) + for m in members: + assert isinstance(m, QAPISchemaMember) + m.set_owner(name) assert prefix is None or isinstance(prefix, str) - self.values = values + self.members = members self.prefix = prefix def check(self, schema): QAPISchemaType.check(self, schema) seen = {} - for v in self.values: - v.check_clash(self.info, seen) + for m in self.members: + m.check_clash(self.info, seen) if self.doc: - self.doc.connect_member(v) + self.doc.connect_member(m) def is_implicit(self): # See QAPISchema._make_implicit_enum_type() and ._def_predefineds() @@ -1191,7 +1191,7 @@ class QAPISchemaEnumType(QAPISchemaType): return c_name(self.name) def member_names(self): - return [v.name for v in self.values] + return [m.name for m in self.members] def json_type(self): return 'string' @@ -1999,19 +1999,19 @@ def wrap_ifcond(ifcond, before, after): return out -def gen_enum_lookup(name, values, prefix=None): +def gen_enum_lookup(name, members, prefix=None): ret = mcgen(''' const QEnumLookup %(c_name)s_lookup = { .array = (const char *const[]) { ''', c_name=c_name(name)) - for value in values: - index = c_enum_const(name, value, prefix) + for m in members: + index = c_enum_const(name, m, prefix) ret += mcgen(''' [%(index)s] = "%(value)s", ''', - index=index, value=value) + index=index, value=m) ret += mcgen(''' }, @@ -2022,9 +2022,9 @@ const QEnumLookup %(c_name)s_lookup = { return ret -def gen_enum(name, values, prefix=None): +def gen_enum(name, members, prefix=None): # append automatically generated _MAX value - enum_values = values + ['_MAX'] + enum_members = members + ['_MAX'] ret = mcgen(''' @@ -2032,11 +2032,11 @@ typedef enum %(c_name)s { ''', c_name=c_name(name)) - for value in enum_values: + for m in enum_members: ret += mcgen(''' %(c_enum)s, ''', - c_enum=c_enum_const(name, value, prefix)) + c_enum=c_enum_const(name, m, prefix)) ret += mcgen(''' } %(c_name)s; diff --git a/scripts/qapi/doc.py b/scripts/qapi/doc.py index d5cfd2336b..6c2bf98e1d 100755 --- a/scripts/qapi/doc.py +++ b/scripts/qapi/doc.py @@ -204,7 +204,7 @@ class QAPISchemaGenDocVisitor(qapi.common.QAPISchemaVisitor): def write(self, output_dir): self._gen.write(output_dir, self._prefix + 'qapi-doc.texi') - def visit_enum_type(self, name, info, ifcond, values, prefix): + def visit_enum_type(self, name, info, ifcond, members, prefix): doc = self.cur_doc self._gen.add(TYPE_FMT(type='Enum', name=doc.symbol, diff --git a/scripts/qapi/introspect.py b/scripts/qapi/introspect.py index cb4825f134..66f7fd00a9 100644 --- a/scripts/qapi/introspect.py +++ b/scripts/qapi/introspect.py @@ -163,8 +163,8 @@ const QLitObject %(c_name)s = %(c_string)s; def visit_builtin_type(self, name, info, json_type): self._gen_qlit(name, 'builtin', {'json-type': json_type}, []) - def visit_enum_type(self, name, info, ifcond, values, prefix): - self._gen_qlit(name, 'enum', {'values': values}, ifcond) + def visit_enum_type(self, name, info, ifcond, members, prefix): + self._gen_qlit(name, 'enum', {'values': members}, ifcond) def visit_array_type(self, name, info, ifcond, element_type): element = self._use_type(element_type) diff --git a/scripts/qapi/types.py b/scripts/qapi/types.py index ce4c91206c..5b790cb41d 100644 --- a/scripts/qapi/types.py +++ b/scripts/qapi/types.py @@ -213,10 +213,10 @@ class QAPISchemaGenTypeVisitor(QAPISchemaModularCVisitor): self._genh.add(gen_type_cleanup_decl(name)) self._genc.add(gen_type_cleanup(name)) - def visit_enum_type(self, name, info, ifcond, values, prefix): + def visit_enum_type(self, name, info, ifcond, members, prefix): with ifcontext(ifcond, self._genh, self._genc): - self._genh.preamble_add(gen_enum(name, values, prefix)) - self._genc.add(gen_enum_lookup(name, values, prefix)) + self._genh.preamble_add(gen_enum(name, members, prefix)) + self._genc.add(gen_enum_lookup(name, members, prefix)) def visit_array_type(self, name, info, ifcond, element_type): with ifcontext(ifcond, self._genh): diff --git a/scripts/qapi/visit.py b/scripts/qapi/visit.py index e4a62ce030..ee776386ae 100644 --- a/scripts/qapi/visit.py +++ b/scripts/qapi/visit.py @@ -301,7 +301,7 @@ class QAPISchemaGenVisitVisitor(QAPISchemaModularCVisitor): ''', types=types)) - def visit_enum_type(self, name, info, ifcond, values, prefix): + def visit_enum_type(self, name, info, ifcond, members, prefix): with ifcontext(ifcond, self._genh, self._genc): self._genh.add(gen_visit_decl(name, scalar=True)) self._genc.add(gen_visit_enum(name)) diff --git a/tests/qapi-schema/test-qapi.py b/tests/qapi-schema/test-qapi.py index 6d25a37dda..f4b8feb9bc 100644 --- a/tests/qapi-schema/test-qapi.py +++ b/tests/qapi-schema/test-qapi.py @@ -23,8 +23,8 @@ class QAPISchemaTestVisitor(QAPISchemaVisitor): def visit_include(self, name, info): print('include %s' % name) - def visit_enum_type(self, name, info, ifcond, values, prefix): - print('enum %s %s' % (name, values)) + def visit_enum_type(self, name, info, ifcond, members, prefix): + print('enum %s %s' % (name, members)) if prefix: print(' prefix %s' % prefix) self._print_if(ifcond)
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. Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> --- scripts/qapi/common.py | 36 +++++++++++++++++----------------- scripts/qapi/doc.py | 2 +- scripts/qapi/introspect.py | 4 ++-- scripts/qapi/types.py | 6 +++--- scripts/qapi/visit.py | 2 +- tests/qapi-schema/test-qapi.py | 4 ++-- 6 files changed, 27 insertions(+), 27 deletions(-)