Mojom compiler: Eliminate duplicate representation of enum values in mojom_files.mojom.

mojo/public/tools/bindings/pylib/mojom/generate/mojom_translator_unittest.py

 # Copyright 2015 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.
 
 import unittest
 import module
 
 try:
   import mojom_translator
   from generated import mojom_files_mojom
@@ skipping 97 matching lines @@
     graph.resolved_types['enum_key'] = mojom_types_mojom.UserDefinedType(
         enum_type=mojom_enum)
 
     mojom_const = mojom_types_mojom.DeclaredConstant(
         decl_data=mojom_types_mojom.DeclarationData(short_name='AConst'),
         type=mojom_types_mojom.Type(
           simple_type=mojom_types_mojom.SimpleType.INT64),
         value=mojom_types_mojom.Value(
           literal_value=mojom_types_mojom.LiteralValue(
             int64_value=30)))
-    user_defined_value = mojom_types_mojom.UserDefinedValue()
-    user_defined_value.declared_constant = mojom_const
-    graph.resolved_values = {'value_key': user_defined_value}
+    graph.resolved_constants = {'constant_key': mojom_const}
 
     mojom_file.declared_mojom_objects = mojom_files_mojom.KeysByType(
         interfaces=['interface_key'],
         structs=['struct_key'],
         unions=['union_key'],
         top_level_enums=['enum_key'],
-        top_level_constants=['value_key']
+        top_level_constants=['constant_key']
         )
 
     mod = mojom_translator.FileTranslator(graph, file_name).Translate()
 
     self.assertEquals('f.mojom', mod.name)
     self.assertEquals(mojom_file.specified_file_name, mod.specified_name)
     self.assertEquals(mojom_file.file_name, mod.path)
     self.assertEquals(mojom_file.module_namespace, mod.namespace)
 
     self.assertEquals(1, len(mod.imports))
@@ skipping 222 matching lines @@
         const.parent_kind)
 
   def test_enum(self):
     file_name = 'a.mojom'
     mojom_enum = mojom_types_mojom.MojomEnum()
     mojom_enum.decl_data = mojom_types_mojom.DeclarationData(
         short_name='AnEnum',
         source_file_info=mojom_types_mojom.SourceFileInfo(file_name=file_name))
     value1 = mojom_types_mojom.EnumValue(
         decl_data=mojom_types_mojom.DeclarationData(short_name='val1'),
-        enum_type_key='AnEnum',
         initializer_value=mojom_types_mojom.Value(
             literal_value=mojom_types_mojom.LiteralValue(uint64_value=20)),
         int_value=20)
     value2 = mojom_types_mojom.EnumValue(
         decl_data=mojom_types_mojom.DeclarationData(short_name='val2'),
-        enum_type_key='AnEnum',
         int_value=70)
     mojom_enum.values = [value1, value2]
 
 
     graph = mojom_files_mojom.MojomFileGraph()
     enum = module.Enum()
     translator = mojom_translator.FileTranslator(graph, file_name)
     translator.EnumFromMojom(
         enum, mojom_types_mojom.UserDefinedType(enum_type=mojom_enum))
 
@@ skipping 363 matching lines @@
 
     mojom_const = mojom_types_mojom.DeclaredConstant(
         decl_data=mojom_types_mojom.DeclarationData(
           short_name='AConst',
           container_type_key='parent_key'),
         type=mojom_types_mojom.Type(
           simple_type=mojom_types_mojom.SimpleType.INT64),
         value=mojom_types_mojom.Value(
           literal_value=mojom_types_mojom.LiteralValue(
             int64_value=30)))
-    user_defined_value = mojom_types_mojom.UserDefinedValue()
-    user_defined_value.declared_constant = mojom_const
-    graph.resolved_values = {'value_key': user_defined_value}
+    graph.resolved_constants = {'constant_key': mojom_const}
 
     contained_declarations = mojom_types_mojom.ContainedDeclarations(
-        enums=['enum_key'], constants=['value_key'])
+        enums=['enum_key'], constants=['constant_key'])
 
     translator = mojom_translator.FileTranslator(graph, file_name)
     struct = module.Struct(name='parent')
     translator._type_cache['parent_key'] = struct
     translator.PopulateContainedDeclarationsFromMojom(
         struct, contained_declarations)
 
     self.assertEquals(
         mojom_enum.decl_data.short_name, struct.enums[0].name)
     self.assertEquals(struct, struct.enums[0].parent_kind)
@@ skipping 55 matching lines @@
     file_name = 'a.mojom'
     mojom_enum = mojom_types_mojom.MojomEnum()
     mojom_enum.decl_data = mojom_types_mojom.DeclarationData(
         short_name='AnEnum',
         source_file_info=mojom_types_mojom.SourceFileInfo(file_name=file_name))
     value1 = mojom_types_mojom.EnumValue(
         decl_data=mojom_types_mojom.DeclarationData(
           short_name='val1',
           source_file_info=mojom_types_mojom.SourceFileInfo(
             file_name=file_name)),
-        enum_type_key='enum_key',
         initializer_value=mojom_types_mojom.Value(
             literal_value=mojom_types_mojom.LiteralValue(uint64_value=20)),
         int_value=20)
     value2 = mojom_types_mojom.EnumValue(
         decl_data=mojom_types_mojom.DeclarationData(short_name='val2'),
-        enum_type_key='enum_key',
         int_value=70)
     mojom_enum.values = [value1, value2]
 
     graph = mojom_files_mojom.MojomFileGraph()
     graph.resolved_types = {
         'enum_key': mojom_types_mojom.UserDefinedType(enum_type=mojom_enum)}
-    graph.resolved_values = {
-        'enum_value1': mojom_types_mojom.UserDefinedValue(enum_value=value1),
-        'enum_value2': mojom_types_mojom.UserDefinedValue(enum_value=value2),
-        }
 
     mojom = mojom_types_mojom.Value(
-        user_value_reference=mojom_types_mojom.UserValueReference(
+        enum_value_reference=mojom_types_mojom.EnumValueReference(
           identifier='SOMEID',
-          value_key='enum_value1'))
+          enum_type_key='enum_key',
+          enum_value_index=0))
 
     translator = mojom_translator.FileTranslator(graph, file_name)
     enum_value = translator.ValueFromMojom(mojom)
     enum = translator.UserDefinedFromTypeKey('enum_key')
 
     self.assertIs(enum, enum_value.enum)
     self.assertIs(value1.decl_data.short_name, enum_value.name)
 
   def test_constant_value(self):
     file_name = 'a.mojom'
     mojom_const = mojom_types_mojom.DeclaredConstant(
         decl_data=mojom_types_mojom.DeclarationData(
           short_name='AConst',
           source_file_info=mojom_types_mojom.SourceFileInfo(
             file_name=file_name)),
         type=mojom_types_mojom.Type(
           simple_type=mojom_types_mojom.SimpleType.INT64),
         value=mojom_types_mojom.Value(
           literal_value=mojom_types_mojom.LiteralValue(
             int64_value=30)))
-    user_defined_value = mojom_types_mojom.UserDefinedValue()
-    user_defined_value.declared_constant = mojom_const
 
     graph = mojom_files_mojom.MojomFileGraph()
-    graph.resolved_values = {'value_key': user_defined_value}
+    graph.resolved_constants = {'constant_key': mojom_const}
 
     mojom = mojom_types_mojom.Value(
-        user_value_reference=mojom_types_mojom.UserValueReference(
+        constant_reference=mojom_types_mojom.ConstantReference(
           identifier='SOMEID',
-          value_key='value_key'))
+          constant_key='constant_key'))
 
     translator = mojom_translator.FileTranslator(graph, file_name)
     const_value = translator.ValueFromMojom(mojom)
     self.assertIs(
-        translator.ConstantFromValueKey('value_key'), const_value.constant)
+        translator.ConstantFromKey('constant_key'), const_value.constant)
     self.assertIs(mojom_const.decl_data.short_name, const_value.name)
 
 
 @unittest.skipUnless(bindings_imported, 'Could not import python bindings.')
 class TestKindFromMojom(unittest.TestCase):
 
   def test_simple_type(self):
     simple_types = [
         (mojom_types_mojom.SimpleType.BOOL, module.BOOL),
         (mojom_types_mojom.SimpleType.INT8, module.INT8),
@@ skipping 193 matching lines @@
   """Builds a list containing a single StructVersion with
   version_number=0, num_bytes=0, and the given value for num_fields. Adds this
   as the |version_info| attribute of |mojom_struct|.
 
   Args:
     mojom_struct: {any} The Python object to which a |version_info| attribute
         will be added.
     num_fields: {int} The value of num_fields to use.
   """
   mojom_struct.version_info=build_version_info(num_fields)