Chromium Code Reviews| Index: tools/json_schema_compiler/idl_schema.py |
| diff --git a/tools/json_schema_compiler/idl_schema.py b/tools/json_schema_compiler/idl_schema.py |
| index a9137569cc348f0583110e279e9a523b016c7543..11b0a8c8d969914af93192d35f0e4c28d6543fd4 100755 |
| --- a/tools/json_schema_compiler/idl_schema.py |
| +++ b/tools/json_schema_compiler/idl_schema.py |
| @@ -271,7 +271,6 @@ class Typeref(object): |
| properties['additionalProperties'] = OrderedDict() |
| properties['additionalProperties']['type'] = 'any' |
| elif self.parent.GetPropertyLocal('Union'): |
| - choices = [] |
| properties['choices'] = [Typeref(node.GetProperty('TYPEREF'), |
| node, |
| OrderedDict()).process(callbacks) |
| @@ -303,7 +302,7 @@ class Enum(object): |
| self.node = enum_node |
| self.description = '' |
| - def process(self, callbacks): |
| + def process(self): |
| enum = [] |
| for node in self.node.GetChildren(): |
| if node.cls == 'EnumItem': |
| @@ -327,7 +326,7 @@ class Enum(object): |
| if self.node.GetProperty(property_name): |
| result[property_name] = self.node.GetProperty(property_name) |
| if self.node.GetProperty('deprecated'): |
| - result[deprecated] = self.node.GetProperty('deprecated') |
| + result['deprecated'] = self.node.GetProperty('deprecated') |
| return result |
| @@ -369,7 +368,7 @@ class Namespace(object): |
| elif node.cls == 'Interface' and node.GetName() == 'Events': |
| self.events = self.process_interface(node) |
| elif node.cls == 'Enum': |
| - self.types.append(Enum(node).process(self.callbacks)) |
| + self.types.append(Enum(node).process()) |
| else: |
| sys.exit('Did not process %s %s' % (node.cls, node)) |
| if self.compiler_options is not None: |
| @@ -391,7 +390,7 @@ class Namespace(object): |
| members = [] |
| for member in node.GetChildren(): |
| if member.cls == 'Member': |
| - name, properties = Member(member).process(self.callbacks) |
| + properties = Member(member).process(self.callbacks)[1] |
|
not at google - send to devlin
2015/01/14 22:44:41
ditto
|
| members.append(properties) |
| return members |