mojo/public/tools/bindings/pylib/mojom/parse/translate.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/parse/translate.py

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

Patch Set: Address yzshen's comments. 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

« mojo/public/cpp/bindings/lib/validate_params.h ('K') | « mojo/public/tools/bindings/pylib/mojom/parse/parser.py ('k') | mojo/public/tools/bindings/pylib/mojom_tests/parse/lexer_unittest.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: mojo/public/tools/bindings/pylib/mojom/parse/translate.py

diff --git a/mojo/public/tools/bindings/pylib/mojom/parse/translate.py b/mojo/public/tools/bindings/pylib/mojom/parse/translate.py

index 77e92c5b8b2065c59ebb7453aa18b7b298cce3f9..958b0c462e84b49cb706dd86ff67637e1f92a8d9 100644

--- a/mojo/public/tools/bindings/pylib/mojom/parse/translate.py

+++ b/mojo/public/tools/bindings/pylib/mojom/parse/translate.py

@@ -40,11 +40,15 @@ def _MapKind(kind):

base_kind = _MapKind(kind[0:-1])

# NOTE: This doesn't rule out enum types. Those will be detected later, when

# cross-reference is established.

- reference_kinds = ('s', 'h', 'a', 'r', 'x')

+ reference_kinds = ('m', 's', 'h', 'a', 'r', 'x')

if base_kind[0] not in reference_kinds:

raise Exception(

'A type (spec "%s") cannot be made nullable' % base_kind)

return '?' + base_kind

+ if kind.endswith('}'):

+ lbracket = kind.rfind('{')

+ value = kind[0:lbracket]

+ return 'm[' + _MapKind(kind[lbracket+1:-1]) + '][' + _MapKind(value) + ']'

if kind.endswith('[]'):

typename = kind[0:-2]

if _FIXED_ARRAY_REGEXP.search(typename):