Mojo: Add String, Float, and Double types to codec.js.

mojo/public/tools/bindings/generators/mojom_js_generator.py

 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Generates JavaScript source files from a mojom.Module."""
 
 import mojom.generate.generator as generator
 import mojom.generate.module as mojom
 import mojom.generate.pack as pack
 from mojom.generate.template_expander import UseJinja
@@ skipping 37 matching lines @@
 def JavaScriptPayloadSize(packed):
   packed_fields = packed.packed_fields
   if not packed_fields:
     return 0;
   last_field = packed_fields[-1]
   offset = last_field.offset + last_field.size
   pad = pack.GetPad(offset, 8)
   return offset + pad;
 
 
-_kind_to_javascript_type = {
+_kind_to_codec_type = {
   mojom.BOOL:         "codec.Uint8",
   mojom.INT8:         "codec.Int8",
   mojom.UINT8:        "codec.Uint8",
   mojom.INT16:        "codec.Int16",
   mojom.UINT16:       "codec.Uint16",
   mojom.INT32:        "codec.Int32",
   mojom.UINT32:       "codec.Uint32",
   mojom.FLOAT:        "codec.Float",
   mojom.HANDLE:       "codec.Handle",
   mojom.DCPIPE:       "codec.Handle",
   mojom.DPPIPE:       "codec.Handle",
   mojom.MSGPIPE:      "codec.Handle",
   mojom.SHAREDBUFFER: "codec.Handle",
   mojom.INT64:        "codec.Int64",
   mojom.UINT64:       "codec.Uint64",
   mojom.DOUBLE:       "codec.Double",
   mojom.STRING:       "codec.String",
 }
 
 
-def GetJavaScriptType(kind):
+def CodecType(kind):
   if kind in mojom.PRIMITIVES:
-    return _kind_to_javascript_type[kind]
+    return _kind_to_codec_type[kind]
   if isinstance(kind, mojom.Struct):
-    return "new codec.PointerTo(%s)" % GetJavaScriptType(kind.name)
+    return "new codec.PointerTo(%s)" % CodecType(kind.name)
   if isinstance(kind, mojom.Array):
-    return "new codec.ArrayOf(%s)" % GetJavaScriptType(kind.kind)
+    return "new codec.ArrayOf(%s)" % CodecType(kind.kind)
   if isinstance(kind, mojom.Interface):
-    return GetJavaScriptType(mojom.MSGPIPE)
+    return CodecType(mojom.MSGPIPE)
   if isinstance(kind, mojom.Enum):
-    return _kind_to_javascript_type[mojom.INT32]
+    return _kind_to_codec_type[mojom.INT32]
   return kind
 
 
-_kind_to_javascript_decode_snippet = {
-  mojom.BOOL:         "readUint8() & 1",
-  mojom.INT8:         "readInt8()",
-  mojom.UINT8:        "readUint8()",
-  mojom.INT16:        "readInt16()",
-  mojom.UINT16:       "readUint16()",
-  mojom.INT32:        "readInt32()",
-  mojom.UINT32:       "readUint32()",
-  mojom.FLOAT:        "readFloat()",
-  mojom.HANDLE:       "decodeHandle()",
-  mojom.DCPIPE:       "decodeHandle()",
-  mojom.DPPIPE:       "decodeHandle()",
-  mojom.MSGPIPE:      "decodeHandle()",
-  mojom.SHAREDBUFFER: "decodeHandle()",
-  mojom.INT64:        "readInt64()",
-  mojom.UINT64:       "readUint64()",
-  mojom.DOUBLE:       "readDouble()",
-  mojom.STRING:       "decodeStringPointer()",
-}
-
-
 def JavaScriptDecodeSnippet(kind):
   if kind in mojom.PRIMITIVES:
-    return _kind_to_javascript_decode_snippet[kind]
+    return "decodeStruct(%s)" % CodecType(kind);
   if isinstance(kind, mojom.Struct):
-    return "decodeStructPointer(%s)" % GetJavaScriptType(kind.name);
+    return "decodeStructPointer(%s)" % CodecType(kind.name);
   if isinstance(kind, mojom.Array):
-    return "decodeArrayPointer(%s)" % GetJavaScriptType(kind.kind);
+    return "decodeArrayPointer(%s)" % CodecType(kind.kind);
   if isinstance(kind, mojom.Interface):
     return JavaScriptDecodeSnippet(mojom.MSGPIPE)
   if isinstance(kind, mojom.Enum):
-    return _kind_to_javascript_decode_snippet[mojom.INT32]
-
-
-_kind_to_javascript_encode_snippet = {
-  mojom.BOOL:         "writeUint8(1 & ",
-  mojom.INT8:         "writeInt8(",
-  mojom.UINT8:        "writeUint8(",
-  mojom.INT16:        "writeInt16(",
-  mojom.UINT16:       "writeUint16(",
-  mojom.INT32:        "writeInt32(",
-  mojom.UINT32:       "writeUint32(",
-  mojom.FLOAT:        "writeFloat(",
-  mojom.HANDLE:       "encodeHandle(",
-  mojom.DCPIPE:       "encodeHandle(",
-  mojom.DPPIPE:       "encodeHandle(",
-  mojom.MSGPIPE:      "encodeHandle(",
-  mojom.SHAREDBUFFER: "encodeHandle(",
-  mojom.INT64:        "writeInt64(",
-  mojom.UINT64:       "writeUint64(",
-  mojom.DOUBLE:       "writeDouble(",
-  mojom.STRING:       "encodeStringPointer(",
-}
+    return JavaScriptDecodeSnippet(mojom.INT32)
 
 
 def JavaScriptEncodeSnippet(kind):
   if kind in mojom.PRIMITIVES:
-    return _kind_to_javascript_encode_snippet[kind]
+    return "encodeStruct(%s, " % CodecType(kind);
   if isinstance(kind, mojom.Struct):
-    return "encodeStructPointer(%s, " % GetJavaScriptType(kind.name);
+    return "encodeStructPointer(%s, " % CodecType(kind.name);
   if isinstance(kind, mojom.Array):
-    return "encodeArrayPointer(%s, " % GetJavaScriptType(kind.kind);
+    return "encodeArrayPointer(%s, " % CodecType(kind.kind);
   if isinstance(kind, mojom.Interface):
     return JavaScriptEncodeSnippet(mojom.MSGPIPE)
   if isinstance(kind, mojom.Enum):
-    return _kind_to_javascript_encode_snippet[mojom.INT32]
+    return JavaScriptEncodeSnippet(mojom.INT32)
 
 def TranslateConstants(token, module):
   if isinstance(token, mojom.Constant):
     # Enum constants are constructed like:
     # NamespaceUid.Struct_Enum.FIELD_NAME
     name = []
     if token.imported_from:
       name.append(token.imported_from["unique_name"])
     if token.parent_kind:
       name.append(token.parent_kind.name + "_" + token.name[0])
@@ skipping 48 matching lines @@
     self.Write(self.GenerateJsModule(), "%s.js" % self.module.name)
 
   def GetImports(self):
     # Since each import is assigned a variable in JS, they need to have unique
     # names.
     counter = 1
     for each in self.module.imports:
       each["unique_name"] = "import" + str(counter)
       counter += 1
     return self.module.imports