@@ -740,7 +740,7 @@ class QAPISchemaEntity(object):
assert isinstance(name, str)
self.name = name
assert info or not QAPISchema.predefined_initialized
- self.info = info
+ self._info = info
def c_name(self):
return c_name(self.name)
@@ -834,7 +834,7 @@ class QAPISchemaBuiltinType(QAPISchemaType):
return self._json_type_name
def visit(self, visitor):
- visitor.visit_builtin_type(self.name, self.info, self.json_type())
+ visitor.visit_builtin_type(self.name, self._info, self.json_type())
class QAPISchemaEnumType(QAPISchemaType):
@@ -860,7 +860,7 @@ class QAPISchemaEnumType(QAPISchemaType):
description = "Union '%s' branch" % owner.name
else:
description = "Enum '%s' value" % self.name
- raise QAPIExprError(self.info,
+ raise QAPIExprError(self._info,
"%s '%s' clashes with '%s'"
% (description, value, seen[c_value]))
seen[c_value] = value
@@ -876,7 +876,7 @@ class QAPISchemaEnumType(QAPISchemaType):
return 'string'
def visit(self, visitor):
- visitor.visit_enum_type(self.name, self.info,
+ visitor.visit_enum_type(self.name, self._info,
self.values, self.prefix)
@@ -895,7 +895,7 @@ class QAPISchemaArrayType(QAPISchemaType):
return 'array'
def visit(self, visitor):
- visitor.visit_array_type(self.name, self.info, self.element_type)
+ visitor.visit_array_type(self.name, self._info, self.element_type)
class QAPISchemaObjectType(QAPISchemaType):
@@ -915,7 +915,7 @@ class QAPISchemaObjectType(QAPISchemaType):
def check(self, schema):
if self.members is False: # check for cycles
assert self._base_name
- raise QAPIExprError(self.info,
+ raise QAPIExprError(self._info,
"Object %s cyclically depends on %s"
% (self.name, self._base_name))
if self.members:
@@ -934,9 +934,9 @@ class QAPISchemaObjectType(QAPISchemaType):
assert m.c_name() not in seen
seen[m.c_name()] = m
for m in self.local_members:
- m.check(schema, self.info, members, seen)
+ m.check(schema, self._info, members, seen)
if self.variants:
- self.variants.check(schema, self.info, members, seen)
+ self.variants.check(schema, self._info, members, seen)
self.members = members
def is_implicit(self):
@@ -954,9 +954,9 @@ class QAPISchemaObjectType(QAPISchemaType):
return 'object'
def visit(self, visitor):
- visitor.visit_object_type(self.name, self.info,
+ visitor.visit_object_type(self.name, self._info,
self.base, self.local_members, self.variants)
- visitor.visit_object_type_flat(self.name, self.info,
+ visitor.visit_object_type_flat(self.name, self._info,
self.members, self.variants)
@@ -1071,13 +1071,13 @@ class QAPISchemaAlternateType(QAPISchemaType):
self.variants = variants
def check(self, schema):
- self.variants.check(schema, self.info, [], {})
+ self.variants.check(schema, self._info, [], {})
def json_type(self):
return 'value'
def visit(self, visitor):
- visitor.visit_alternate_type(self.name, self.info, self.variants)
+ visitor.visit_alternate_type(self.name, self._info, self.variants)
class QAPISchemaCommand(QAPISchemaEntity):
@@ -1102,7 +1102,7 @@ class QAPISchemaCommand(QAPISchemaEntity):
assert isinstance(self.ret_type, QAPISchemaType)
def visit(self, visitor):
- visitor.visit_command(self.name, self.info,
+ visitor.visit_command(self.name, self._info,
self.arg_type, self.ret_type,
self.gen, self.success_response)
@@ -1121,7 +1121,7 @@ class QAPISchemaEvent(QAPISchemaEntity):
assert not self.arg_type.variants # not implemented
def visit(self, visitor):
- visitor.visit_event(self.name, self.info, self.arg_type)
+ visitor.visit_event(self.name, self._info, self.arg_type)
class QAPISchema(object):
Now that nothing but sub-classes are using QAPISchemaEntity.info, rename it to _info to ensure that external users do not revert to using it again. Signed-off-by: Eric Blake <eblake@redhat.com> --- v6: split from 11/46; probably worth dropping --- scripts/qapi.py | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-)