mojo/public/tools/bindings/pylib/mojom/generate/data.py - Issue 611633002: mojom: Add associative arrays to the mojom language.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: mojo/public/tools/bindings/pylib/mojom/generate/data.py

Issue 611633002: mojom: Add associative arrays to the mojom language. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Moved test classes to their own shared file. Created 6 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « mojo/public/tools/bindings/generators/mojom_cpp_generator.py ('k') | mojo/public/tools/bindings/pylib/mojom/generate/module.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: mojo/public/tools/bindings/pylib/mojom/generate/data.py

diff --git a/mojo/public/tools/bindings/pylib/mojom/generate/data.py b/mojo/public/tools/bindings/pylib/mojom/generate/data.py

index fab7e2e875b3ad5e13de2108ad55d2fd586ffdb5..829f3b24649ea22a861379b96c04e9d59130f593 100644

--- a/mojo/public/tools/bindings/pylib/mojom/generate/data.py

+++ b/mojo/public/tools/bindings/pylib/mojom/generate/data.py

@@ -123,6 +123,12 @@ def KindFromData(kinds, data, scope):

kind = mojom.Array(KindFromData(kinds, data[2:], scope))

elif data.startswith('r:'):

kind = mojom.InterfaceRequest(KindFromData(kinds, data[2:], scope))

+ elif data.startswith('m['):

+ # Isolate the two types from their brackets

+ first_kind = data[2:data.find(']')]

+ second_kind = data[data.rfind('[')+1:data.rfind(']')]

+ kind = mojom.Map(KindFromData(kinds, first_kind, scope),

+ KindFromData(kinds, second_kind, scope))

elif data.startswith('a'):

colon = data.find(':')

length = int(data[1:colon])