Mojo: Add support for constants to the IDL compiler.

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 18 matching lines @@
   mojom.STRING:       '""',
 }
 
 
 def JavaScriptDefaultValue(field):
   if field.default:
     raise Exception("Default values should've been handled in jinja.")
   if field.kind in mojom.PRIMITIVES:
     return _kind_to_javascript_default_value[field.kind]
   if isinstance(field.kind, mojom.Struct):
-    return "null";
+    return "null"
   if isinstance(field.kind, mojom.Array):
-    return "[]";
+    return "[]"
   if isinstance(field.kind, mojom.Interface):
     return _kind_to_javascript_default_value[mojom.MSGPIPE]
   if isinstance(field.kind, mojom.Enum):
     return "0"
 
 
 def JavaScriptPayloadSize(packed):
   packed_fields = packed.packed_fields
   if not packed_fields:
-    return 0;
+    return 0
   last_field = packed_fields[-1]
   offset = last_field.offset + last_field.size
   pad = pack.GetPad(offset, 8)
-  return offset + pad;
+  return offset + pad
 
 
 _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",
@@ skipping 19 matching lines @@
     return "new codec.ArrayOf(%s)" % CodecType(kind.kind)
   if isinstance(kind, mojom.Interface):
     return CodecType(mojom.MSGPIPE)
   if isinstance(kind, mojom.Enum):
     return _kind_to_codec_type[mojom.INT32]
   return kind
 
 
 def JavaScriptDecodeSnippet(kind):
   if kind in mojom.PRIMITIVES:
-    return "decodeStruct(%s)" % CodecType(kind);
+    return "decodeStruct(%s)" % CodecType(kind)
   if isinstance(kind, mojom.Struct):
-    return "decodeStructPointer(%s)" % CodecType(kind.name);
+    return "decodeStructPointer(%s)" % CodecType(kind.name)
   if isinstance(kind, mojom.Array):
-    return "decodeArrayPointer(%s)" % CodecType(kind.kind);
+    return "decodeArrayPointer(%s)" % CodecType(kind.kind)
   if isinstance(kind, mojom.Interface):
     return JavaScriptDecodeSnippet(mojom.MSGPIPE)
   if isinstance(kind, mojom.Enum):
     return JavaScriptDecodeSnippet(mojom.INT32)
 
 
 def JavaScriptEncodeSnippet(kind):
   if kind in mojom.PRIMITIVES:
-    return "encodeStruct(%s, " % CodecType(kind);
+    return "encodeStruct(%s, " % CodecType(kind)
   if isinstance(kind, mojom.Struct):
-    return "encodeStructPointer(%s, " % CodecType(kind.name);
+    return "encodeStructPointer(%s, " % CodecType(kind.name)
   if isinstance(kind, mojom.Array):
-    return "encodeArrayPointer(%s, " % CodecType(kind.kind);
+    return "encodeArrayPointer(%s, " % CodecType(kind.kind)
   if isinstance(kind, mojom.Interface):
     return JavaScriptEncodeSnippet(mojom.MSGPIPE)
   if isinstance(kind, mojom.Enum):
     return JavaScriptEncodeSnippet(mojom.INT32)
 
+
 def TranslateConstants(token, module):
-  if isinstance(token, mojom.Constant):
-    # Enum constants are constructed like:
-    # NamespaceUid.Struct_Enum.FIELD_NAME
+  if isinstance(token, (mojom.EnumValue, mojom.NamedValue)):
+    # Both variable and enum constants are constructed like:
+    # NamespaceUid.Struct[.Enum].CONSTANT_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])
-    else:
-      name.append(token.name[0])
-    name.append(token.name[1])
+      name.append(token.parent_kind.name)
+    if isinstance(token, mojom.EnumValue):
+      name.append(token.enum_name)
+    name.append(token.name)
     return ".".join(name)
   return token
 
 
 def ExpressionToText(value, module):
   if value[0] != "EXPRESSION":
     raise Exception("Expected EXPRESSION, got" + value)
   return "".join(generator.ExpressionMapper(value,
       lambda token: TranslateConstants(token, module)))
 
@@ skipping 35 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