Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(576)

Side by Side Diff: mojo/public/tools/bindings/generators/mojom_js_generator.py

Issue 654843005: Mojo JS Bindings: add support for associative arrays (Mojo map type) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed a typo 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 unified diff | Download patch
OLDNEW
1 # Copyright 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 """Generates JavaScript source files from a mojom.Module.""" 5 """Generates JavaScript source files from a mojom.Module."""
6 6
7 import mojom.generate.generator as generator 7 import mojom.generate.generator as generator
8 import mojom.generate.module as mojom 8 import mojom.generate.module as mojom
9 import mojom.generate.pack as pack 9 import mojom.generate.pack as pack
10 from mojom.generate.template_expander import UseJinja 10 from mojom.generate.template_expander import UseJinja
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 if mojom.IsStructKind(field.kind): 47 if mojom.IsStructKind(field.kind):
48 assert field.default == "default" 48 assert field.default == "default"
49 return "new %s()" % JavaScriptType(field.kind) 49 return "new %s()" % JavaScriptType(field.kind)
50 return ExpressionToText(field.default) 50 return ExpressionToText(field.default)
51 if field.kind in mojom.PRIMITIVES: 51 if field.kind in mojom.PRIMITIVES:
52 return _kind_to_javascript_default_value[field.kind] 52 return _kind_to_javascript_default_value[field.kind]
53 if mojom.IsStructKind(field.kind): 53 if mojom.IsStructKind(field.kind):
54 return "null" 54 return "null"
55 if mojom.IsAnyArrayKind(field.kind): 55 if mojom.IsAnyArrayKind(field.kind):
56 return "null" 56 return "null"
57 if mojom.IsMapKind(field.kind):
58 return "null"
57 if mojom.IsInterfaceKind(field.kind) or \ 59 if mojom.IsInterfaceKind(field.kind) or \
58 mojom.IsInterfaceRequestKind(field.kind): 60 mojom.IsInterfaceRequestKind(field.kind):
59 return _kind_to_javascript_default_value[mojom.MSGPIPE] 61 return _kind_to_javascript_default_value[mojom.MSGPIPE]
60 if mojom.IsEnumKind(field.kind): 62 if mojom.IsEnumKind(field.kind):
61 return "0" 63 return "0"
62 64
63 65
64 def JavaScriptPayloadSize(packed): 66 def JavaScriptPayloadSize(packed):
65 packed_fields = packed.packed_fields 67 packed_fields = packed.packed_fields
66 if not packed_fields: 68 if not packed_fields:
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 array_type = "NullableArrayOf" if mojom.IsNullableKind(kind) else "ArrayOf" 111 array_type = "NullableArrayOf" if mojom.IsNullableKind(kind) else "ArrayOf"
110 element_type = "codec.PackedBool" if mojom.IsBoolKind(kind.kind) \ 112 element_type = "codec.PackedBool" if mojom.IsBoolKind(kind.kind) \
111 else CodecType(kind.kind) 113 else CodecType(kind.kind)
112 return "new codec.%s(%s)" % (array_type, element_type) 114 return "new codec.%s(%s)" % (array_type, element_type)
113 if mojom.IsInterfaceKind(kind) or mojom.IsInterfaceRequestKind(kind): 115 if mojom.IsInterfaceKind(kind) or mojom.IsInterfaceRequestKind(kind):
114 return CodecType(mojom.MSGPIPE) 116 return CodecType(mojom.MSGPIPE)
115 if mojom.IsEnumKind(kind): 117 if mojom.IsEnumKind(kind):
116 return _kind_to_codec_type[mojom.INT32] 118 return _kind_to_codec_type[mojom.INT32]
117 return kind 119 return kind
118 120
121 def MapCodecType(kind):
122 return "codec.PackedBool" if mojom.IsBoolKind(kind) else CodecType(kind)
119 123
120 def JavaScriptDecodeSnippet(kind): 124 def JavaScriptDecodeSnippet(kind):
121 if kind in mojom.PRIMITIVES: 125 if kind in mojom.PRIMITIVES:
122 return "decodeStruct(%s)" % CodecType(kind) 126 return "decodeStruct(%s)" % CodecType(kind)
123 if mojom.IsStructKind(kind): 127 if mojom.IsStructKind(kind):
124 return "decodeStructPointer(%s)" % JavaScriptType(kind) 128 return "decodeStructPointer(%s)" % JavaScriptType(kind)
129 if mojom.IsMapKind(kind):
130 return "decodeMapPointer(%s, %s)" % \
131 (MapCodecType(kind.key_kind), MapCodecType(kind.value_kind))
125 if mojom.IsAnyArrayKind(kind) and mojom.IsBoolKind(kind.kind): 132 if mojom.IsAnyArrayKind(kind) and mojom.IsBoolKind(kind.kind):
126 return "decodeArrayPointer(codec.PackedBool)" 133 return "decodeArrayPointer(codec.PackedBool)"
127 if mojom.IsAnyArrayKind(kind): 134 if mojom.IsAnyArrayKind(kind):
128 return "decodeArrayPointer(%s)" % CodecType(kind.kind) 135 return "decodeArrayPointer(%s)" % CodecType(kind.kind)
129 if mojom.IsInterfaceKind(kind) or mojom.IsInterfaceRequestKind(kind): 136 if mojom.IsInterfaceKind(kind) or mojom.IsInterfaceRequestKind(kind):
130 return JavaScriptDecodeSnippet(mojom.MSGPIPE) 137 return JavaScriptDecodeSnippet(mojom.MSGPIPE)
131 if mojom.IsEnumKind(kind): 138 if mojom.IsEnumKind(kind):
132 return JavaScriptDecodeSnippet(mojom.INT32) 139 return JavaScriptDecodeSnippet(mojom.INT32)
133 140
134 141
135 def JavaScriptEncodeSnippet(kind): 142 def JavaScriptEncodeSnippet(kind):
136 if kind in mojom.PRIMITIVES: 143 if kind in mojom.PRIMITIVES:
137 return "encodeStruct(%s, " % CodecType(kind) 144 return "encodeStruct(%s, " % CodecType(kind)
138 if mojom.IsStructKind(kind): 145 if mojom.IsStructKind(kind):
139 return "encodeStructPointer(%s, " % JavaScriptType(kind) 146 return "encodeStructPointer(%s, " % JavaScriptType(kind)
147 if mojom.IsMapKind(kind):
148 return "encodeMapPointer(%s, %s, " % \
149 (MapCodecType(kind.key_kind), MapCodecType(kind.value_kind))
140 if mojom.IsAnyArrayKind(kind) and mojom.IsBoolKind(kind.kind): 150 if mojom.IsAnyArrayKind(kind) and mojom.IsBoolKind(kind.kind):
141 return "encodeArrayPointer(codec.PackedBool, "; 151 return "encodeArrayPointer(codec.PackedBool, ";
142 if mojom.IsAnyArrayKind(kind): 152 if mojom.IsAnyArrayKind(kind):
143 return "encodeArrayPointer(%s, " % CodecType(kind.kind) 153 return "encodeArrayPointer(%s, " % CodecType(kind.kind)
144 if mojom.IsInterfaceKind(kind) or mojom.IsInterfaceRequestKind(kind): 154 if mojom.IsInterfaceKind(kind) or mojom.IsInterfaceRequestKind(kind):
145 return JavaScriptEncodeSnippet(mojom.MSGPIPE) 155 return JavaScriptEncodeSnippet(mojom.MSGPIPE)
146 if mojom.IsEnumKind(kind): 156 if mojom.IsEnumKind(kind):
147 return JavaScriptEncodeSnippet(mojom.INT32) 157 return JavaScriptEncodeSnippet(mojom.INT32)
148 158
149 159
(...skipping 17 matching lines...) Expand all
167 (field_offset, element_size, element_count, element_type, nullable) 177 (field_offset, element_size, element_count, element_type, nullable)
168 178
169 179
170 def JavaScriptValidateStructParams(packed_field): 180 def JavaScriptValidateStructParams(packed_field):
171 nullable = JavaScriptNullableParam(packed_field) 181 nullable = JavaScriptNullableParam(packed_field)
172 field_offset = JavaScriptFieldOffset(packed_field) 182 field_offset = JavaScriptFieldOffset(packed_field)
173 struct_type = JavaScriptType(packed_field.field.kind) 183 struct_type = JavaScriptType(packed_field.field.kind)
174 return "%s, %s, %s" % (field_offset, struct_type, nullable) 184 return "%s, %s, %s" % (field_offset, struct_type, nullable)
175 185
176 186
187 def JavaScriptValidateMapParams(packed_field):
188 nullable = JavaScriptNullableParam(packed_field)
189 field_offset = JavaScriptFieldOffset(packed_field)
190 keys_type = MapCodecType(packed_field.field.kind.key_kind)
191 values_kind = packed_field.field.kind.value_kind;
192 values_type = MapCodecType(values_kind)
193 values_nullable = "true" if mojom.IsNullableKind(values_kind) else "false"
194 return "%s, %s, %s, %s, %s" % \
195 (field_offset, nullable, keys_type, values_type, values_nullable)
196
197
177 def JavaScriptValidateStringParams(packed_field): 198 def JavaScriptValidateStringParams(packed_field):
178 nullable = JavaScriptNullableParam(packed_field) 199 nullable = JavaScriptNullableParam(packed_field)
179 return "%s, %s" % (JavaScriptFieldOffset(packed_field), nullable) 200 return "%s, %s" % (JavaScriptFieldOffset(packed_field), nullable)
180 201
181 202
182 def JavaScriptValidateHandleParams(packed_field): 203 def JavaScriptValidateHandleParams(packed_field):
183 nullable = JavaScriptNullableParam(packed_field) 204 nullable = JavaScriptNullableParam(packed_field)
184 field_offset = JavaScriptFieldOffset(packed_field) 205 field_offset = JavaScriptFieldOffset(packed_field)
185 return "%s, %s" % (field_offset, nullable) 206 return "%s, %s" % (field_offset, nullable)
186 207
(...skipping 30 matching lines...) Expand all
217 238
218 def IsArrayPointerField(field): 239 def IsArrayPointerField(field):
219 return mojom.IsAnyArrayKind(field.kind) 240 return mojom.IsAnyArrayKind(field.kind)
220 241
221 def IsStringPointerField(field): 242 def IsStringPointerField(field):
222 return mojom.IsStringKind(field.kind) 243 return mojom.IsStringKind(field.kind)
223 244
224 def IsStructPointerField(field): 245 def IsStructPointerField(field):
225 return mojom.IsStructKind(field.kind) 246 return mojom.IsStructKind(field.kind)
226 247
248 def IsMapPointerField(field):
249 return mojom.IsMapKind(field.kind)
250
227 def IsHandleField(field): 251 def IsHandleField(field):
228 return mojom.IsAnyHandleKind(field.kind) 252 return mojom.IsAnyHandleKind(field.kind)
229 253
230 254
231 class Generator(generator.Generator): 255 class Generator(generator.Generator):
232 256
233 js_filters = { 257 js_filters = {
234 "default_value": JavaScriptDefaultValue, 258 "default_value": JavaScriptDefaultValue,
235 "payload_size": JavaScriptPayloadSize, 259 "payload_size": JavaScriptPayloadSize,
236 "decode_snippet": JavaScriptDecodeSnippet, 260 "decode_snippet": JavaScriptDecodeSnippet,
237 "encode_snippet": JavaScriptEncodeSnippet, 261 "encode_snippet": JavaScriptEncodeSnippet,
238 "expression_to_text": ExpressionToText, 262 "expression_to_text": ExpressionToText,
239 "field_offset": JavaScriptFieldOffset, 263 "field_offset": JavaScriptFieldOffset,
240 "has_callbacks": mojom.HasCallbacks, 264 "has_callbacks": mojom.HasCallbacks,
241 "is_array_pointer_field": IsArrayPointerField, 265 "is_array_pointer_field": IsArrayPointerField,
266 "is_map_pointer_field": IsMapPointerField,
242 "is_struct_pointer_field": IsStructPointerField, 267 "is_struct_pointer_field": IsStructPointerField,
243 "is_string_pointer_field": IsStringPointerField, 268 "is_string_pointer_field": IsStringPointerField,
244 "is_handle_field": IsHandleField, 269 "is_handle_field": IsHandleField,
245 "js_type": JavaScriptType, 270 "js_type": JavaScriptType,
246 "stylize_method": generator.StudlyCapsToCamel, 271 "stylize_method": generator.StudlyCapsToCamel,
247 "validate_array_params": JavaScriptValidateArrayParams, 272 "validate_array_params": JavaScriptValidateArrayParams,
248 "validate_handle_params": JavaScriptValidateHandleParams, 273 "validate_handle_params": JavaScriptValidateHandleParams,
274 "validate_map_params": JavaScriptValidateMapParams,
249 "validate_string_params": JavaScriptValidateStringParams, 275 "validate_string_params": JavaScriptValidateStringParams,
250 "validate_struct_params": JavaScriptValidateStructParams, 276 "validate_struct_params": JavaScriptValidateStructParams,
251 } 277 }
252 278
253 def GetParameters(self): 279 def GetParameters(self):
254 return { 280 return {
255 "namespace": self.module.namespace, 281 "namespace": self.module.namespace,
256 "imports": self.GetImports(), 282 "imports": self.GetImports(),
257 "kinds": self.module.kinds, 283 "kinds": self.module.kinds,
258 "enums": self.module.enums, 284 "enums": self.module.enums,
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
295 return self.module.imports 321 return self.module.imports
296 322
297 def GetImportedInterfaces(self): 323 def GetImportedInterfaces(self):
298 interface_to_import = {}; 324 interface_to_import = {};
299 for each_import in self.module.imports: 325 for each_import in self.module.imports:
300 for each_interface in each_import["module"].interfaces: 326 for each_interface in each_import["module"].interfaces:
301 name = each_interface.name 327 name = each_interface.name
302 interface_to_import[name] = each_import["unique_name"] + "." + name 328 interface_to_import[name] = each_import["unique_name"] + "." + name
303 return interface_to_import; 329 return interface_to_import;
304 330
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698