Mojom parser: Compute and validate struct field ordinals.

mojom/mojom_parser/serialization/serialization.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.
 
 package serialization
 
 import (
         "fmt"
         "mojo/public/go/bindings"
         "mojom/mojom_parser/generated/mojom_files"
@@ skipping 238 matching lines @@
                 panic(fmt.Sprintf("Unexpected type: %T", t))
 
         }
 }
 
 func translateMojomStruct(s *mojom.MojomStruct) mojom_types.MojomStruct {
         mojomStruct := mojom_types.MojomStruct{}
         mojomStruct.DeclData = translateDeclarationData(&s.DeclarationData)
         mojomStruct.DeclData.ContainedDeclarations = translateContainedDeclarations(&s.NestedDeclarations)
 
-        for _, field := range s.Fields {
+        for _, field := range s.FieldsInOrdinalOrder() {
                 mojomStruct.Fields = append(mojomStruct.Fields, translateStructField(field))
         }
 
         // TODO(rudominer) Implement VersionInfo.
         //mojomStruct.Value.VersionInfo = new([]mojom_types.StructVersion)
 
         return mojomStruct
 }
 
 func translateStructField(f *mojom.StructField) (field mojom_types.StructField) {
@@ skipping 334 matching lines @@
         }
 
         // declared_ordinal field
         if d.DeclaredOrdinal() < 0 {
                 declData.DeclaredOrdinal = -1
         } else {
                 declData.DeclaredOrdinal = int32(d.DeclaredOrdinal())
         }
 
         // declaration_order
-        // TODO(rudominer) DeclarationOrder is currently not populated.
-        declData.DeclarationOrder = -1
+        if d.LexicalPosition() < 0 {
+                declData.DeclarationOrder = -1
+        } else {
+                declData.DeclarationOrder = d.LexicalPosition()
+        }
 
         // container_type_key
         containingType := d.ContainingType()
         if containingType != nil {
                 switch d.DeclaredObject().(type) {
                 // We do not serialize the |container_type_key| field for objects that only exist
                 // as children of their container objects and are not independently
                 // referenceable.
                 case *mojom.StructField, *mojom.MojomMethod:
                         // We do not serialize the |container_type_key| field for an EnumValue
@@ skipping 42 matching lines @@
 
 // stringPointer is a convenience function for creating a pointer to a string whose value
 // is the specified string. It may be used in situations where the compiler will
 // not allow you to take the address of a string value directly, such as the
 // return value of a function. It is necessary to create pointers to strings because
 // that is how the Mojom type |string?| (i.e. nullable string) is represented in
 // in the Mojom Go bindings.
 func stringPointer(s string) *string {
         return &s
 }