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

mojom/generated/mojom_files/mojom_files.mojom.go

 // 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.
 
 // This file is autogenerated by:
 //     mojo/public/tools/bindings/mojom_bindings_generator.py
 // For:
 //     mojo/public/interfaces/bindings/mojom_files.mojom
 //
 
@@ skipping 269 matching lines @@
                         (*s.SerializedRuntimeTypeInfo) = value0
                 }
         }
         if err := decoder.Finish(); err != nil {
                 return err
         }
         return nil
 }
 
 type MojomFileGraph struct {
-        Files          map[string]MojomFile
-        ResolvedTypes  map[string]mojom_types.UserDefinedType
-        ResolvedValues map[string]mojom_types.UserDefinedValue
+        Files             map[string]MojomFile
+        ResolvedTypes     map[string]mojom_types.UserDefinedType
+        ResolvedConstants map[string]mojom_types.DeclaredConstant
 }
 
 func (s *MojomFileGraph) Encode(encoder *bindings.Encoder) error {
         encoder.StartStruct(24, 0)
         if err := encoder.WritePointer(); err != nil {
                 return err
         }
         encoder.StartMap()
         {
                 var keys0 []string
@@ skipping 102 matching lines @@
         }
         if err := encoder.Finish(); err != nil {
                 return err
         }
         if err := encoder.WritePointer(); err != nil {
                 return err
         }
         encoder.StartMap()
         {
                 var keys0 []string
-                var values0 []mojom_types.UserDefinedValue
+                var values0 []mojom_types.DeclaredConstant
                 if encoder.Deterministic() {
-                        for key0, _ := range s.ResolvedValues {
+                        for key0, _ := range s.ResolvedConstants {
                                 keys0 = append(keys0, key0)
                         }
                         bindings.SortMapKeys(&keys0)
-                        values0 = make([]mojom_types.UserDefinedValue, len(keys0))
+                        values0 = make([]mojom_types.DeclaredConstant, len(keys0))
                         for i, key := range keys0 {
-                                values0[i] = s.ResolvedValues[key]
+                                values0[i] = s.ResolvedConstants[key]
                         }
                 } else {
-                        for key0, value0 := range s.ResolvedValues {
+                        for key0, value0 := range s.ResolvedConstants {
                                 keys0 = append(keys0, key0)
                                 values0 = append(values0, value0)
                         }
                 }
                 if err := encoder.WritePointer(); err != nil {
                         return err
                 }
                 encoder.StartArray(uint32(len(keys0)), 64)
                 for _, elem1 := range keys0 {
                         if err := encoder.WritePointer(); err != nil {
                                 return err
                         }
                         if err := encoder.WriteString(elem1); err != nil {
                                 return err
                         }
                 }
                 if err := encoder.Finish(); err != nil {
                         return err
                 }
                 if err := encoder.WritePointer(); err != nil {
                         return err
                 }
-                encoder.StartArray(uint32(len(values0)), 128)
+                encoder.StartArray(uint32(len(values0)), 64)
                 for _, elem1 := range values0 {
-                        if elem1 == nil {
-                                return &bindings.ValidationError{bindings.UnexpectedNullUnion, "unexpected null union"}
+                        if err := encoder.WritePointer(); err != nil {
+                                return err
                         }
                         if err := elem1.Encode(encoder); err != nil {
                                 return err
                         }
                 }
                 if err := encoder.Finish(); err != nil {
                         return err
                 }
         }
         if err := encoder.Finish(); err != nil {
@@ skipping 249 matching lines @@
                                                                 return err
                                                         }
                                                         keys0[i1] = value2
                                                 }
                                         }
                                         if err := decoder.Finish(); err != nil {
                                                 return err
                                         }
                                 }
                         }
-                        var values0 []mojom_types.UserDefinedValue
+                        var values0 []mojom_types.DeclaredConstant
                         {
                                 pointer1, err := decoder.ReadPointer()
                                 if err != nil {
                                         return err
                                 }
                                 if pointer1 == 0 {
                                         return &bindings.ValidationError{bindings.UnexpectedNullPointer, "unexpected null pointer"}
                                 } else {
-                                        len1, err := decoder.StartArray(128)
+                                        len1, err := decoder.StartArray(64)
                                         if err != nil {
                                                 return err
                                         }
-                                        values0 = make([]mojom_types.UserDefinedValue, len1)
+                                        values0 = make([]mojom_types.DeclaredConstant, len1)
                                         for i1 := uint32(0); i1 < len1; i1++ {
-                                                var err error
-                                                values0[i1], err = mojom_types.DecodeUserDefinedValue(decoder)
+                                                pointer2, err := decoder.ReadPointer()
                                                 if err != nil {
                                                         return err
                                                 }
-                                                if values0[i1] == nil {
-                                                        return &bindings.ValidationError{bindings.UnexpectedNullUnion, "unexpected null union"}
+                                                if pointer2 == 0 {
+                                                        return &bindings.ValidationError{bindings.UnexpectedNullPointer, "unexpected null pointer"}
+                                                } else {
+                                                        if err := values0[i1].Decode(decoder); err != nil {
+                                                                return err
+                                                        }
                                                 }
                                         }
                                         if err := decoder.Finish(); err != nil {
                                                 return err
                                         }
                                 }
                         }
                         if len(keys0) != len(values0) {
                                 return &bindings.ValidationError{bindings.DifferentSizedArraysInMap,
                                         fmt.Sprintf("Number of keys %d is different from number of values %d", len(keys0), len(values0)),
                                 }
                         }
                         if err := decoder.Finish(); err != nil {
                                 return err
                         }
                         len0 := len(keys0)
-                        map0 := make(map[string]mojom_types.UserDefinedValue)
+                        map0 := make(map[string]mojom_types.DeclaredConstant)
                         for i0 := 0; i0 < len0; i0++ {
                                 map0[keys0[i0]] = values0[i0]
                         }
-                        s.ResolvedValues = map0
+                        s.ResolvedConstants = map0
                 }
         }
         if err := decoder.Finish(); err != nil {
                 return err
         }
         return nil
 }
 
 type KeysByType struct {
         Interfaces        *[]string
@@ skipping 405 matching lines @@
                         if err := decoder.Finish(); err != nil {
                                 return err
                         }
                 }
         }
         if err := decoder.Finish(); err != nil {
                 return err
         }
         return nil
 }