Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / mojo / public / tools / bindings / pylib / mojom / generate / data.py

diff --git a/src/mojo/public/tools/bindings/pylib/mojom/generate/data.py b/src/mojo/public/tools/bindings/pylib/mojom/generate/data.py
index fab7e2e..85c9105 100644 (file)
--- a/src/mojo/public/tools/bindings/pylib/mojom/generate/data.py
+++ b/src/mojo/public/tools/bindings/pylib/mojom/generate/data.py
@@ -121,12 +121,18 @@ def KindFromData(kinds, data, scope):
     kind = KindFromData(kinds, data[1:], scope).MakeNullableKind()
   elif data.startswith('a:'):
     kind = mojom.Array(KindFromData(kinds, data[2:], scope))
-  elif data.startswith('r:'):
-    kind = mojom.InterfaceRequest(KindFromData(kinds, data[2:], scope))
   elif data.startswith('a'):
     colon = data.find(':')
     length = int(data[1:colon])
-    kind = mojom.FixedArray(length, KindFromData(kinds, data[colon+1:], scope))
+    kind = mojom.Array(KindFromData(kinds, data[colon+1:], scope), length)
+  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))
   else:
     kind = mojom.Kind(data)