Mojo: Correctly handle large unsigned integer literals.

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 11 matching lines @@
   mojom.HANDLE:       "mojo::Handle",
   mojom.DCPIPE:       "mojo::DataPipeConsumerHandle",
   mojom.DPPIPE:       "mojo::DataPipeProducerHandle",
   mojom.MSGPIPE:      "mojo::MessagePipeHandle",
   mojom.SHAREDBUFFER: "mojo::SharedBufferHandle",
   mojom.INT64:        "int64_t",
   mojom.UINT64:       "uint64_t",
   mojom.DOUBLE:       "double",
 }
 
+_kind_to_cpp_literal_suffix = {
+  mojom.UINT8:        "U",
+  mojom.UINT16:       "U",
+  mojom.UINT32:       "U",
+  mojom.FLOAT:        "f",
+  mojom.UINT64:       "U",

[viettrungluu, 2014/07/15 16:08:26]

Maybe this should be "ULL"?

[Sam McNally, 2014/07/16 01:20:18]

Done.

+}
+
+def ConstantValue(constant):
+  return ExpressionToText(constant.value, kind=constant.kind)
+
 def DefaultValue(field):
   if field.default:
     if isinstance(field.kind, mojom.Struct):
       assert field.default == "default"
       return "%s::New()" % GetNameForKind(field.kind)
-    return ExpressionToText(field.default)
+    return ExpressionToText(field.default, kind=field.kind)
   return ""
 
 def NamespaceToArray(namespace):
   return namespace.split('.') if namespace else []
 
 def GetNameForKind(kind, internal = False):
   parts = []
   if kind.imported_from:
     parts.extend(NamespaceToArray(kind.imported_from["namespace"]))
   if internal:
@@ skipping 138 matching lines @@
   if kind.spec == 's':
     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):
+def TranslateConstants(token, kind):
   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)
     return "::".join(name)
-  return token
+  return '%s%s' % (token, _kind_to_cpp_literal_suffix.get(kind, ''))
 
-def ExpressionToText(value):
-  return TranslateConstants(value)
+def ExpressionToText(value, kind=None):
+  return TranslateConstants(value, kind)
 
 def HasCallbacks(interface):
   for method in interface.methods:
     if method.response_parameters != None:
       return True
   return False
 
 def ShouldInlineStruct(struct):
   # TODO(darin): Base this on the size of the wrapper class.
   if len(struct.fields) > 4:
     return False
   for field in struct.fields:
     if generator.IsHandleKind(field.kind) or generator.IsObjectKind(field.kind):
       return False
   return True
 
 _HEADER_SIZE = 8
 
 class Generator(generator.Generator):
 
   cpp_filters = {
+    "constant_value": ConstantValue,
     "cpp_const_wrapper_type": GetCppConstWrapperType,
     "cpp_field_type": GetCppFieldType,
     "cpp_pod_type": GetCppPodType,
     "cpp_result_type": GetCppResultWrapperType,
     "cpp_type": GetCppType,
     "cpp_wrapper_type": GetCppWrapperType,
     "default_value": DefaultValue,
     "expected_array_size": generator.ExpectedArraySize,
     "expression_to_text": ExpressionToText,
     "get_name_for_kind": GetNameForKind,
@@ skipping 37 matching lines @@
 
   @UseJinja("cpp_templates/module.cc.tmpl", filters=cpp_filters)
   def GenerateModuleSource(self):
     return self.GetJinjaExports()
 
   def GenerateFiles(self, args):
     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)