diff options
Diffstat (limited to 'mojo/public/tools/bindings/pylib/mojom')
5 files changed, 9 insertions, 6 deletions
diff --git a/mojo/public/tools/bindings/pylib/mojom/generate/data.py b/mojo/public/tools/bindings/pylib/mojom/generate/data.py index 1f2f808..2199782 100644 --- a/mojo/public/tools/bindings/pylib/mojom/generate/data.py +++ b/mojo/public/tools/bindings/pylib/mojom/generate/data.py @@ -221,7 +221,7 @@ def MethodFromData(module, data, interface): def InterfaceToData(interface): return { istr(0, 'name'): interface.name, - istr(1, 'peer'): interface.peer, + istr(1, 'client'): interface.client, istr(2, 'methods'): map(MethodToData, interface.methods) } @@ -229,7 +229,7 @@ def InterfaceFromData(module, data): interface = mojom.Interface(module=module) interface.name = data['name'] interface.spec = 'x:' + module.namespace + '.' + interface.name - interface.peer = data['peer'] if data.has_key('peer') else None + interface.client = data['client'] if data.has_key('client') else None module.kinds[interface.spec] = interface interface.enums = map(lambda enum: EnumFromData(module, enum, interface), data['enums']) diff --git a/mojo/public/tools/bindings/pylib/mojom/generate/data_tests.py b/mojo/public/tools/bindings/pylib/mojom/generate/data_tests.py index bca7ed8..096554c 100644 --- a/mojo/public/tools/bindings/pylib/mojom/generate/data_tests.py +++ b/mojo/public/tools/bindings/pylib/mojom/generate/data_tests.py @@ -44,7 +44,7 @@ test_dict = { {'name': 'testfield2', 'kind': 'a:i32', 'ordinal': 42}]}], 'interfaces': [{ 'name': 'Server', - 'peer': None, + 'client': None, 'methods': [{ 'name': 'Foo', 'parameters': [ diff --git a/mojo/public/tools/bindings/pylib/mojom/generate/generator.py b/mojo/public/tools/bindings/pylib/mojom/generate/generator.py index 709aa2a..76e5998 100644 --- a/mojo/public/tools/bindings/pylib/mojom/generate/generator.py +++ b/mojo/public/tools/bindings/pylib/mojom/generate/generator.py @@ -46,6 +46,9 @@ def IsObjectKind(kind): def IsHandleKind(kind): return kind.spec.startswith('h') or isinstance(kind, mojom.Interface) +def IsInterfaceKind(kind): + return isinstance(kind, mojom.Interface) + def StudlyCapsToCamel(studly): return studly[0].lower() + studly[1:] diff --git a/mojo/public/tools/bindings/pylib/mojom/generate/module.py b/mojo/public/tools/bindings/pylib/mojom/generate/module.py index 4abe690..875ede9 100644 --- a/mojo/public/tools/bindings/pylib/mojom/generate/module.py +++ b/mojo/public/tools/bindings/pylib/mojom/generate/module.py @@ -139,7 +139,7 @@ class Method(object): class Interface(Kind): - def __init__(self, name=None, peer=None, module=None): + def __init__(self, name=None, client=None, module=None): self.module = module self.name = name if name != None: @@ -147,7 +147,7 @@ class Interface(Kind): else: spec = None Kind.__init__(self, spec) - self.peer = peer + self.client = client self.methods = [] def AddMethod(self, name, ordinal=None): diff --git a/mojo/public/tools/bindings/pylib/mojom/parse/translate.py b/mojo/public/tools/bindings/pylib/mojom/parse/translate.py index 2300cb6..b363d9c 100644 --- a/mojo/public/tools/bindings/pylib/mojom/parse/translate.py +++ b/mojo/public/tools/bindings/pylib/mojom/parse/translate.py @@ -88,7 +88,7 @@ def _MapStruct(tree): def _MapInterface(tree): interface = {} interface['name'] = tree[1] - interface['peer'] = _GetAttribute(tree[2], 'Peer') + interface['client'] = _GetAttribute(tree[2], 'Client') interface['methods'] = _MapTree(_MapMethod, tree[3], 'METHOD') interface['enums'] = _MapTree(_MapEnum, tree[3], 'ENUM') return interface |