Mojo: Add support for constants to the IDL compiler.

mojo/public/tools/bindings/generators/mojom_cpp_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 C++ 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 39 matching lines @@
   if isinstance(kind, mojom.Array):
     return "mojo::internal::Array_Data<%s>*" % GetCppType(kind.kind)
   if isinstance(kind, mojom.Interface):
     return "%sHandle" % kind.name
   if isinstance(kind, mojom.Enum):
     return "int32_t"
   if kind.spec == 's':
     return "mojo::internal::String_Data*"
   return _kind_to_cpp_type[kind]
 
+def GetCppPodType(kind):
+  if kind.spec == 's':
+    return "char*"
+  return _kind_to_cpp_type[kind]
+
 def GetCppArrayArgWrapperType(kind):
   if isinstance(kind, (mojom.Struct, mojom.Enum)):
     return GetNameForKind(kind)
   if isinstance(kind, mojom.Array):
     return "mojo::Array<%s >" % GetCppArrayArgWrapperType(kind.kind)
   if isinstance(kind, mojom.Interface):
     return "%sHandle" % kind.name
   if kind.spec == 's':
     return "mojo::String"
   return _kind_to_cpp_type[kind]
@@ skipping 71 matching lines @@
     return "mojo::internal::StringPointer"
   return _kind_to_cpp_type[kind]
 
 def IsStructWithHandles(struct):
   for pf in struct.packed.packed_fields:
     if generator.IsHandleKind(pf.field.kind):
       return True
   return False
 
 def TranslateConstants(token, module):
-  if isinstance(token, mojom.Constant):
-    # Enum constants are constructed like:
-    # Namespace::Struct::FIELD_NAME
+  if isinstance(token, (mojom.NamedValue, mojom.EnumValue)):
+    # Both variable and enum constants are constructed like:
+    # Namespace::Struct::CONSTANT_NAME
     name = []
     if token.imported_from:
       name.extend(NamespaceToArray(token.namespace))
     if token.parent_kind:
       name.append(token.parent_kind.name)
-    name.append(token.name[1])
+    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)))
 
 _HEADER_SIZE = 8
 
 class Generator(generator.Generator):
 
   cpp_filters = {
     "cpp_const_wrapper_type": GetCppConstWrapperType,
     "cpp_field_type": GetCppFieldType,
+    "cpp_pod_type": GetCppPodType,
+    "cpp_result_type": GetCppResultWrapperType,
     "cpp_type": GetCppType,
-    "cpp_result_type": GetCppResultWrapperType,
     "cpp_wrapper_type": GetCppWrapperType,
     "expression_to_text": ExpressionToText,
     "get_pad": pack.GetPad,
     "is_enum_kind": generator.IsEnumKind,
     "is_handle_kind": generator.IsHandleKind,
     "is_object_kind": generator.IsObjectKind,
     "is_string_kind": generator.IsStringKind,
     "is_array_kind": lambda kind: isinstance(kind, mojom.Array),
     "is_struct_with_handles": IsStructWithHandles,
     "struct_size": lambda ps: ps.GetTotalSize() + _HEADER_SIZE,
@@ skipping 25 matching lines @@
 
   @UseJinja("cpp_templates/module.cc.tmpl", filters=cpp_filters)
   def GenerateModuleSource(self):
     return self.GetJinjaExports()
 
   def GenerateFiles(self):
     self.Write(self.GenerateModuleHeader(), "%s.h" % self.module.name)
     self.Write(self.GenerateModuleInternalHeader(),
         "%s-internal.h" % self.module.name)
     self.Write(self.GenerateModuleSource(), "%s.cc" % self.module.name)