Mojom parser: Compute and validate struct field ordinals.

mojom/mojom_parser/serialization/serialization_test.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 53 matching lines @@
 }
 
 // endTestCase() should be invoked at the end of a case in
 // TestSingleFileSerialization.
 func (test *singleFileTest) endTestCase() {
         test.expectedGraph().Files = make(map[string]mojom_files.MojomFile)
         test.expectedGraph().Files[test.fileName()] = *test.expectedFile()
         test.testCaseNum += 1
 }
 
-// newShortDeclData constructs a new DeclarationData with the given data.
+// newShortDeclDataO constructs a new DeclarationData with the given data.
 func (test *singleFileTest) newShortDeclData(shortName string) *mojom_types.DeclarationData {
         declData := test.newContainedDeclData(shortName, "", nil)
         declData.FullIdentifier = nil
         return declData
 }
 
+// newShortDeclDataO constructs a new DeclarationData with the given data.
+func (test *singleFileTest) newShortDeclDataO(declarationOrder, declaredOrdinal int32, shortName string) *mojom_types.DeclarationData {
+        declData := test.newContainedDeclDataA(declarationOrder, declaredOrdinal, shortName, "", nil, nil)
+        declData.FullIdentifier = nil
+        return declData
+}
+
 // newDeclData constructs a new DeclarationData with the given data.
 func (test *singleFileTest) newDeclData(shortName, fullIdentifier string) *mojom_types.DeclarationData {
         return test.newContainedDeclData(shortName, fullIdentifier, nil)
 }
 
+// newDeclData constructs a new DeclarationData with the given data.
+func (test *singleFileTest) newDeclDataO(declarationOrder, declaredOrdinal int32, shortName, fullIdentifier string) *mojom_types.DeclarationData {
+        return test.newContainedDeclDataA(declarationOrder, declaredOrdinal, shortName, fullIdentifier, nil, nil)
+}
+
 // newDeclDataA constructs a new DeclarationData with the given data, including attributes.
 func (test *singleFileTest) newDeclDataA(shortName, fullIdentifier string,
         attributes *[]mojom_types.Attribute) *mojom_types.DeclarationData {
-        return test.newContainedDeclDataA(shortName, fullIdentifier, nil, attributes)
+        return test.newContainedDeclDataA(-1, -1, shortName, fullIdentifier, nil, attributes)
 }
 
 // newShortDeclDataA constructs a new DeclarationData with the given data, including attributes.
 func (test *singleFileTest) newShortDeclDataA(shortName string,
         attributes *[]mojom_types.Attribute) *mojom_types.DeclarationData {
-        declData := test.newContainedDeclDataA(shortName, "", nil, attributes)
+        declData := test.newContainedDeclDataA(-1, -1, shortName, "", nil, attributes)
+        declData.FullIdentifier = nil
+        return declData
+}
+
+// newShortDeclDataA constructs a new DeclarationData with the given data, including attributes.
+func (test *singleFileTest) newShortDeclDataAO(declarationOrder, declaredOrdinal int32, shortName string,
+        attributes *[]mojom_types.Attribute) *mojom_types.DeclarationData {
+        declData := test.newContainedDeclDataA(declarationOrder, declaredOrdinal, shortName, "", nil, attributes)
         declData.FullIdentifier = nil
         return declData
 }
 
 // newContainedDeclData constructs a new DeclarationData with the given data.
 func (test *singleFileTest) newContainedDeclData(shortName, fullIdentifier string, containerTypeKey *string) *mojom_types.DeclarationData {
-        return test.newContainedDeclDataA(shortName, fullIdentifier, containerTypeKey, nil)
+        return test.newContainedDeclDataA(-1, -1, shortName, fullIdentifier, containerTypeKey, nil)
 }
 
 // newContainedDeclDataA constructs a new DeclarationData with the given data, including attributes.
-func (test *singleFileTest) newContainedDeclDataA(shortName, fullIdentifier string,
+func (test *singleFileTest) newContainedDeclDataA(declarationOrder, declaredOrdinal int32, shortName, fullIdentifier string,
         containerTypeKey *string, attributes *[]mojom_types.Attribute) *mojom_types.DeclarationData {
-        return newContainedDeclDataA(test.fileName(), shortName, fullIdentifier, containerTypeKey, attributes)
+        return newContainedDeclDataA(declarationOrder, declaredOrdinal, test.fileName(), shortName, fullIdentifier, containerTypeKey, attributes)
 }
 
 // newDeclData constructs a new DeclarationData with the given data.
 func newDeclData(fileName, shortName, fullIdentifier string) *mojom_types.DeclarationData {
         return newContainedDeclData(fileName, shortName, fullIdentifier, nil)
 }
 
+// newDeclData constructs a new DeclarationData with the given data.
+func newDeclDataO(declarationOrder, declaredOrdinal int32, fileName, shortName, fullIdentifier string) *mojom_types.DeclarationData {
+        return newContainedDeclDataA(declarationOrder, declaredOrdinal, fileName, shortName, fullIdentifier, nil, nil)
+}
+
 // newDeclDataA constructs a new DeclarationData with the given data, including attributes.
 func newDeclDataA(fileName, shortName, fullIdentifier string,
         attributes *[]mojom_types.Attribute) *mojom_types.DeclarationData {
-        return newContainedDeclDataA(fileName, shortName, fullIdentifier, nil, attributes)
+        return newContainedDeclDataA(-1, -1, fileName, shortName, fullIdentifier, nil, attributes)
 }
 
 // newContainedDeclData constructs a new DeclarationData with the given data.
 func newContainedDeclData(fileName, shortName, fullIdentifier string, containerTypeKey *string) *mojom_types.DeclarationData {
-        return newContainedDeclDataA(fileName, shortName, fullIdentifier, containerTypeKey, nil)
+        return newContainedDeclDataA(-1, -1, fileName, shortName, fullIdentifier, containerTypeKey, nil)
 }
 
 // newContainedDeclDataA constructs a new DeclarationData with the given data, including attributes.
-func newContainedDeclDataA(fileName, shortName, fullIdentifier string,
+func newContainedDeclDataA(declarationOrder, declaredOrdinal int32, fileName, shortName, fullIdentifier string,
         containerTypeKey *string, attributes *[]mojom_types.Attribute) *mojom_types.DeclarationData {
         var fullyQualifiedName *string
         if fullIdentifier != "" {
                 fullyQualifiedName = &fullIdentifier
         }
         return &mojom_types.DeclarationData{
                 Attributes:       attributes,
                 ShortName:        &shortName,
                 FullIdentifier:   fullyQualifiedName,
-                DeclaredOrdinal:  -1,
-                DeclarationOrder: -1,
+                DeclaredOrdinal:  declaredOrdinal,
+                DeclarationOrder: declarationOrder,
                 ContainerTypeKey: containerTypeKey,
                 SourceFileInfo: &mojom_types.SourceFileInfo{
                         FileName: fileName,
                 }}
 }
 
 // TestSingleFileSerialization uses a series of test cases in which the text of a .mojom
 // file is specified and the expected MojomFileGraph is specified using Go struct literals.
 func TestSingleFileSerialization(t *testing.T) {
         test := singleFileTest{}
 
         ////////////////////////////////////////////////////////////
+        // Test Case: struct field ordinals
+        ////////////////////////////////////////////////////////////
+        {
+
+                contents := `
+        struct Foo{
+          int32 x@2;
+          int32 y@3;
+          int32 z@0;
+          int32 w@1;
+        };`
+
+                test.addTestCase("", contents)
+
+                // DeclaredMojomObjects
+                test.expectedFile().DeclaredMojomObjects.Structs = &[]string{"TYPE_KEY:Foo"}
+
+                // ResolvedTypes
+
+                // struct Foo
+                test.expectedGraph().ResolvedTypes["TYPE_KEY:Foo"] = &mojom_types.UserDefinedTypeStructType{mojom_types.MojomStruct{
+                        DeclData: test.newDeclData("Foo", "Foo"),
+                        Fields: []mojom_types.StructField{
+                                // The fields are in ordinal order and the first two arguments to newShortDeclDataO() are
+                                // declarationOrder and declaredOrdinal.
+
+                                // field z
+                                {
+                                        DeclData: test.newShortDeclDataO(2, 0, "z"),
+                                        Type:     &mojom_types.TypeSimpleType{mojom_types.SimpleType_InT32},
+                                },
+                                // field w
+                                {
+                                        DeclData: test.newShortDeclDataO(3, 1, "w"),
+                                        Type:     &mojom_types.TypeSimpleType{mojom_types.SimpleType_InT32},
+                                },
+                                // field x
+                                {
+                                        DeclData: test.newShortDeclDataO(0, 2, "x"),
+                                        Type:     &mojom_types.TypeSimpleType{mojom_types.SimpleType_InT32},
+                                },
+                                // field y
+                                {
+                                        DeclData: test.newShortDeclDataO(1, 3, "y"),
+                                        Type:     &mojom_types.TypeSimpleType{mojom_types.SimpleType_InT32},
+                                },
+                        },
+                }}
+
+                test.endTestCase()
+        }
+
+        ////////////////////////////////////////////////////////////
+        // Test Case: struct field ordinals, some implicit
+        ////////////////////////////////////////////////////////////
+        {
+
+                contents := `
+        struct Foo{
+          int32 x@2;
+          int32 y;
+          int32 z@0;
+          int32 w;
+        };`
+
+                test.addTestCase("", contents)
+
+                // DeclaredMojomObjects
+                test.expectedFile().DeclaredMojomObjects.Structs = &[]string{"TYPE_KEY:Foo"}
+
+                // ResolvedTypes
+
+                // struct Foo
+                test.expectedGraph().ResolvedTypes["TYPE_KEY:Foo"] = &mojom_types.UserDefinedTypeStructType{mojom_types.MojomStruct{
+                        DeclData: test.newDeclData("Foo", "Foo"),
+                        Fields: []mojom_types.StructField{
+                                // The fields are in ordinal order and the first two arguments to newShortDeclDataO() are
+                                // declarationOrder and declaredOrdinal.
+
+                                // field z
+                                {
+                                        DeclData: test.newShortDeclDataO(2, 0, "z"),
+                                        Type:     &mojom_types.TypeSimpleType{mojom_types.SimpleType_InT32},
+                                },
+                                // field w
+                                {
+                                        DeclData: test.newShortDeclDataO(3, -1, "w"),
+                                        Type:     &mojom_types.TypeSimpleType{mojom_types.SimpleType_InT32},
+                                },
+                                // field x
+                                {
+                                        DeclData: test.newShortDeclDataO(0, 2, "x"),
+                                        Type:     &mojom_types.TypeSimpleType{mojom_types.SimpleType_InT32},
+                                },
+                                // field y
+                                {
+                                        DeclData: test.newShortDeclDataO(1, -1, "y"),
+                                        Type:     &mojom_types.TypeSimpleType{mojom_types.SimpleType_InT32},
+                                },
+                        },
+                }}
+
+                test.endTestCase()
+        }
+
+        ////////////////////////////////////////////////////////////
         // Test Case: array of int32
         ////////////////////////////////////////////////////////////
         {
 
                 contents := `
         struct Foo{
           array<int32> bar1;
           array<int32, 7> bar2;
           array<int32>? bar3;
           array<int32, 8>? bar4;
         };`
 
                 test.addTestCase("", contents)
 
                 // DeclaredMojomObjects
                 test.expectedFile().DeclaredMojomObjects.Structs = &[]string{"TYPE_KEY:Foo"}
 
                 // ResolvedTypes
 
                 // struct Foo
                 test.expectedGraph().ResolvedTypes["TYPE_KEY:Foo"] = &mojom_types.UserDefinedTypeStructType{mojom_types.MojomStruct{
                         DeclData: test.newDeclData("Foo", "Foo"),
                         Fields: []mojom_types.StructField{
                                 // field bar1 is not nullable and not fixed length
                                 {
-                                        DeclData: test.newShortDeclData("bar1"),
+                                        DeclData: test.newShortDeclDataO(0, -1, "bar1"),
                                         Type: &mojom_types.TypeArrayType{mojom_types.ArrayType{
                                                 false, -1, &mojom_types.TypeSimpleType{mojom_types.SimpleType_InT32}}},
                                 },
                                 // field bar2 is not nullable and fixed length of 7
                                 {
-                                        DeclData: test.newShortDeclData("bar2"),
+                                        DeclData: test.newShortDeclDataO(1, -1, "bar2"),
                                         Type: &mojom_types.TypeArrayType{mojom_types.ArrayType{
                                                 false, 7, &mojom_types.TypeSimpleType{mojom_types.SimpleType_InT32}}},
                                 },
                                 // field bar3 is nullable and not fixed length
                                 {
-                                        DeclData: test.newShortDeclData("bar3"),
+                                        DeclData: test.newShortDeclDataO(2, -1, "bar3"),
                                         Type: &mojom_types.TypeArrayType{mojom_types.ArrayType{
                                                 true, -1, &mojom_types.TypeSimpleType{mojom_types.SimpleType_InT32}}},
                                 },
                                 // field bar4 is nullable and fixed length of 8
                                 {
-                                        DeclData: test.newShortDeclData("bar4"),
+                                        DeclData: test.newShortDeclDataO(3, -1, "bar4"),
                                         Type: &mojom_types.TypeArrayType{mojom_types.ArrayType{
                                                 true, 8, &mojom_types.TypeSimpleType{mojom_types.SimpleType_InT32}}},
                                 },
                         },
                 }}
 
                 test.endTestCase()
         }
 
         ////////////////////////////////////////////////////////////
@@ skipping 15 matching lines @@
                 test.expectedFile().DeclaredMojomObjects.Structs = &[]string{"TYPE_KEY:Foo"}
 
                 // ResolvedTypes
 
                 // struct Foo
                 test.expectedGraph().ResolvedTypes["TYPE_KEY:Foo"] = &mojom_types.UserDefinedTypeStructType{mojom_types.MojomStruct{
                         DeclData: test.newDeclData("Foo", "Foo"),
                         Fields: []mojom_types.StructField{
                                 // field bar1 is non-nullable with a non-nullable key.
                                 {
-                                        DeclData: test.newShortDeclData("bar1"),
+                                        DeclData: test.newShortDeclDataO(0, -1, "bar1"),
                                         Type: &mojom_types.TypeMapType{mojom_types.MapType{
                                                 false,
                                                 &mojom_types.TypeStringType{mojom_types.StringType{false}},
                                                 &mojom_types.TypeSimpleType{mojom_types.SimpleType_InT32}}},
                                 },
                                 // field bar2 is non-nullable with a nullable key.
                                 {
-                                        DeclData: test.newShortDeclData("bar2"),
+                                        DeclData: test.newShortDeclDataO(1, -1, "bar2"),
                                         Type: &mojom_types.TypeMapType{mojom_types.MapType{
                                                 false,
                                                 &mojom_types.TypeStringType{mojom_types.StringType{true}},
                                                 &mojom_types.TypeSimpleType{mojom_types.SimpleType_InT32}}},
                                 },
                                 // field bar3 is nullable with a non-nullable key.
                                 {
-                                        DeclData: test.newShortDeclData("bar3"),
+                                        DeclData: test.newShortDeclDataO(2, -1, "bar3"),
                                         Type: &mojom_types.TypeMapType{mojom_types.MapType{
                                                 true,
                                                 &mojom_types.TypeStringType{mojom_types.StringType{false}},
                                                 &mojom_types.TypeSimpleType{mojom_types.SimpleType_InT32}}},
                                 },
                                 // field bar4 is nullable with a nullable key.
                                 {
-                                        DeclData: test.newShortDeclData("bar4"),
+                                        DeclData: test.newShortDeclDataO(3, -1, "bar4"),
                                         Type: &mojom_types.TypeMapType{mojom_types.MapType{
                                                 true,
                                                 &mojom_types.TypeStringType{mojom_types.StringType{true}},
                                                 &mojom_types.TypeSimpleType{mojom_types.SimpleType_InT32}}},
                                 },
                         },
                 }}
 
                 test.endTestCase()
         }
@@ skipping 136 matching lines @@
                                 DeclarationOrder: -1,
                                 SourceFileInfo: &mojom_types.SourceFileInfo{
                                         FileName: test.fileName(),
                                 },
                                 ContainedDeclarations: &mojom_types.ContainedDeclarations{
                                         Constants: &[]string{"TYPE_KEY:MyStruct.RED"}},
                         },
                         Fields: []mojom_types.StructField{
                                 // field a_color
                                 {
-                                        DeclData: test.newShortDeclData("a_color"),
+                                        DeclData: test.newShortDeclDataO(0, -1, "a_color"),
                                         Type: &mojom_types.TypeTypeReference{mojom_types.TypeReference{
                                                 false, false, stringPointer("Color"), stringPointer("TYPE_KEY:Color")}},
                                         DefaultValue: &mojom_types.DefaultFieldValueValue{&mojom_types.ValueUserValueReference{
                                                 mojom_types.UserValueReference{
                                                         Identifier: "RED",
                                                         ValueKey:   stringPointer("TYPE_KEY:MyStruct.RED")}}}, // Note this refers to MyStruct.RED and not Color.RED.
                                 },
                         },
                 }}
 
@@ skipping 23 matching lines @@
                 // interface EchoService
                 test.expectedGraph().ResolvedTypes["TYPE_KEY:test.EchoService"] = &mojom_types.UserDefinedTypeInterfaceType{mojom_types.MojomInterface{
                         DeclData: test.newDeclData("EchoService", "test.EchoService"),
                         Methods: map[uint32]mojom_types.MojomMethod{
                                 0: mojom_types.MojomMethod{
                                         DeclData: test.newDeclData("EchoString", ""),
                                         Parameters: mojom_types.MojomStruct{
                                                 DeclData: test.newDeclData("EchoString-request", ""),
                                                 Fields: []mojom_types.StructField{
                                                         mojom_types.StructField{
-                                                                DeclData: test.newDeclData("value", ""),
+                                                                DeclData: test.newDeclDataO(0, -1, "value", ""),
                                                                 Type:     &mojom_types.TypeStringType{mojom_types.StringType{true}},
                                                         },
                                                 },
                                         },
                                         ResponseParams: &mojom_types.MojomStruct{
                                                 DeclData: test.newDeclData("EchoString-response", ""),
                                                 Fields: []mojom_types.StructField{
                                                         mojom_types.StructField{
-                                                                DeclData: test.newDeclData("value", ""),
+                                                                DeclData: test.newDeclDataO(0, -1, "value", ""),
                                                                 Type:     &mojom_types.TypeStringType{mojom_types.StringType{true}},
                                                         },
                                                 },
                                         },
                                 },
                                 1: mojom_types.MojomMethod{
                                         DeclData: test.newDeclData("DelayedEchoString", ""),
                                         Parameters: mojom_types.MojomStruct{
                                                 DeclData: test.newDeclData("DelayedEchoString-request", ""),
                                                 Fields: []mojom_types.StructField{
                                                         mojom_types.StructField{
-                                                                DeclData: test.newDeclData("value", ""),
+                                                                DeclData: test.newDeclDataO(0, -1, "value", ""),
                                                                 Type:     &mojom_types.TypeStringType{mojom_types.StringType{true}},
                                                         },
                                                         mojom_types.StructField{
-                                                                DeclData: test.newDeclData("millis", ""),
+                                                                DeclData: test.newDeclDataO(1, -1, "millis", ""),
                                                                 Type:     &mojom_types.TypeSimpleType{mojom_types.SimpleType_InT32},
                                                         },
                                                 },
                                         },
                                         ResponseParams: &mojom_types.MojomStruct{
                                                 DeclData: test.newDeclData("DelayedEchoString-response", ""),
                                                 Fields: []mojom_types.StructField{
                                                         mojom_types.StructField{
-                                                                DeclData: test.newDeclData("value", ""),
+                                                                DeclData: test.newDeclDataO(0, -1, "value", ""),
                                                                 Type:     &mojom_types.TypeStringType{mojom_types.StringType{true}},
                                                         },
                                                 },
                                         },
                                         Ordinal: 1,
                                 },
                         },
                 }}
 
                 test.endTestCase()
@@ skipping 23 matching lines @@
                 test.expectedGraph().ResolvedTypes["TYPE_KEY:test.EchoService"] = &mojom_types.UserDefinedTypeInterfaceType{mojom_types.MojomInterface{
                         DeclData:    test.newDeclDataA("EchoService", "test.EchoService", &[]mojom_types.Attribute{{"ServiceName", &mojom_types.LiteralValueStringValue{"my.test.EchoService"}}}),
                         ServiceName: stringPointer("my.test.EchoService"),
                         Methods: map[uint32]mojom_types.MojomMethod{
                                 0: mojom_types.MojomMethod{
                                         DeclData: test.newDeclData("EchoString", ""),
                                         Parameters: mojom_types.MojomStruct{
                                                 DeclData: test.newDeclData("EchoString-request", ""),
                                                 Fields: []mojom_types.StructField{
                                                         mojom_types.StructField{
-                                                                DeclData: test.newDeclData("value", ""),
+                                                                DeclData: test.newDeclDataO(0, -1, "value", ""),
                                                                 Type:     &mojom_types.TypeStringType{mojom_types.StringType{true}},
                                                         },
                                                 },
                                         },
                                         ResponseParams: &mojom_types.MojomStruct{
                                                 DeclData: test.newDeclData("EchoString-response", ""),
                                                 Fields: []mojom_types.StructField{
                                                         mojom_types.StructField{
-                                                                DeclData: test.newDeclData("value", ""),
+                                                                DeclData: test.newDeclDataO(0, -1, "value", ""),
                                                                 Type:     &mojom_types.TypeStringType{mojom_types.StringType{true}},
                                                         },
                                                 },
                                         },
                                 },
                         },
                 }}
 
                 test.endTestCase()
         }
@@ skipping 241 matching lines @@
                                 DeclarationOrder: -1,
                                 SourceFileInfo: &mojom_types.SourceFileInfo{
                                         FileName: test.fileName(),
                                 },
                                 ContainedDeclarations: &mojom_types.ContainedDeclarations{
                                         Enums: &[]string{"TYPE_KEY:mojom.test.Foo.Hats"}},
                         },
                         Fields: []mojom_types.StructField{
                                 // field x
                                 {
-                                        DeclData: test.newShortDeclData("x"),
+                                        DeclData: test.newShortDeclDataO(0, -1, "x"),
                                         Type:     &mojom_types.TypeSimpleType{mojom_types.SimpleType_InT32},
                                 },
                                 // field y
                                 {
-                                        DeclData:     test.newShortDeclDataA("y", &[]mojom_types.Attribute{{"min_version", &mojom_types.LiteralValueInt8Value{2}}}),
+                                        DeclData:     test.newShortDeclDataAO(1, -1, "y", &[]mojom_types.Attribute{{"min_version", &mojom_types.LiteralValueInt8Value{2}}}),
                                         Type:         &mojom_types.TypeStringType{mojom_types.StringType{false}},
                                         DefaultValue: &mojom_types.DefaultFieldValueValue{&mojom_types.ValueLiteralValue{&mojom_types.LiteralValueStringValue{"hello"}}},
                                 },
                                 // field z
                                 {
-                                        DeclData: test.newShortDeclData("z"),
+                                        DeclData: test.newShortDeclDataO(2, -1, "z"),
                                         Type:     &mojom_types.TypeStringType{mojom_types.StringType{true}},
                                 },
                         },
                 }}
 
                 // enum Hats
                 test.expectedGraph().ResolvedTypes["TYPE_KEY:mojom.test.Foo.Hats"] = &mojom_types.UserDefinedTypeEnumType{mojom_types.MojomEnum{
                         DeclData: test.newContainedDeclData("Hats", "mojom.test.Foo.Hats", stringPointer("TYPE_KEY:mojom.test.Foo")),
                         Values: []mojom_types.EnumValue{
                                 // Note(rudominer) It is a bug that we need to copy the enum values here.
@@ skipping 551 matching lines @@
                 // InterfaceA
                 test.expectedRuntimeTypeInfoA().TypeMap["TYPE_KEY:a.b.c.InterfaceA"] = &mojom_types.UserDefinedTypeInterfaceType{mojom_types.MojomInterface{
                         DeclData: newDeclData(test.fileNameA(), "InterfaceA", "a.b.c.InterfaceA"),
                         Methods: map[uint32]mojom_types.MojomMethod{
                                 0: mojom_types.MojomMethod{
                                         DeclData: newDeclData(test.fileNameA(), "DoIt", ""),
                                         Parameters: mojom_types.MojomStruct{
                                                 DeclData: newDeclData(test.fileNameA(), "DoIt-request", ""),
                                                 Fields: []mojom_types.StructField{
                                                         mojom_types.StructField{
-                                                                DeclData: newDeclData(test.fileNameA(), "x", ""),
+                                                                DeclData: newDeclDataO(0, -1, test.fileNameA(), "x", ""),
                                                                 Type: &mojom_types.TypeTypeReference{mojom_types.TypeReference{
                                                                         false, false, stringPointer("FooA"), stringPointer("TYPE_KEY:a.b.c.FooA")}},
                                                         },
                                                 },
                                         },
                                         ResponseParams: &mojom_types.MojomStruct{
                                                 DeclData: newDeclData(test.fileNameA(), "DoIt-response", ""),
                                                 Fields: []mojom_types.StructField{
                                                         mojom_types.StructField{
-                                                                DeclData: newDeclData(test.fileNameA(), "y", ""),
+                                                                DeclData: newDeclDataO(0, -1, test.fileNameA(), "y", ""),
                                                                 Type: &mojom_types.TypeTypeReference{mojom_types.TypeReference{
                                                                         true, false, stringPointer("b.c.d.FooB"), stringPointer("TYPE_KEY:b.c.d.FooB")}},
                                                         },
                                                 },
                                         },
                                 },
                         },
                 }}
 
                 ////////////////////////////////////////////////////////////////////////
 
                 // TypeMap for file B
 
                 // FooA
                 test.expectedRuntimeTypeInfoB().TypeMap["TYPE_KEY:b.c.d.FooB"] = &mojom_types.UserDefinedTypeStructType{mojom_types.MojomStruct{
                         DeclData: newDeclData(test.fileNameB(), "FooB", "b.c.d.FooB"),
                         Fields:   []mojom_types.StructField{}}}
 
                 // InterfaceB
                 test.expectedRuntimeTypeInfoB().TypeMap["TYPE_KEY:b.c.d.InterfaceB"] = &mojom_types.UserDefinedTypeInterfaceType{mojom_types.MojomInterface{
                         DeclData: newDeclData(test.fileNameB(), "InterfaceB", "b.c.d.InterfaceB"),
                         Methods: map[uint32]mojom_types.MojomMethod{
                                 0: mojom_types.MojomMethod{
                                         DeclData: newDeclData(test.fileNameB(), "DoIt", ""),
                                         Parameters: mojom_types.MojomStruct{
                                                 DeclData: newDeclData(test.fileNameB(), "DoIt-request", ""),
                                                 Fields: []mojom_types.StructField{
                                                         mojom_types.StructField{
-                                                                DeclData: newDeclData(test.fileNameB(), "x", ""),
+                                                                DeclData: newDeclDataO(0, -1, test.fileNameB(), "x", ""),
                                                                 Type: &mojom_types.TypeTypeReference{mojom_types.TypeReference{
                                                                         false, false, stringPointer("a.b.c.FooA"), stringPointer("TYPE_KEY:a.b.c.FooA")}},
                                                         },
                                                 },
                                         },
                                         ResponseParams: &mojom_types.MojomStruct{
                                                 DeclData: newDeclData(test.fileNameB(), "DoIt-response", ""),
                                                 Fields: []mojom_types.StructField{
                                                         mojom_types.StructField{
-                                                                DeclData: newDeclData(test.fileNameB(), "y", ""),
+                                                                DeclData: newDeclDataO(0, -1, test.fileNameB(), "y", ""),
                                                                 Type: &mojom_types.TypeTypeReference{mojom_types.TypeReference{
                                                                         true, false, stringPointer("FooB"), stringPointer("TYPE_KEY:b.c.d.FooB")}},
                                                         },
                                                 },
                                         },
                                 },
                         },
                 }}
 
                 test.endTestCase()
@@ skipping 45 matching lines @@
                         DeclData: newDeclDataA(test.fileNameA(), "InterfaceA", "a.b.c.InterfaceA",
                                 &[]mojom_types.Attribute{{"ServiceName", &mojom_types.LiteralValueStringValue{"AwesomeService"}}}),
                         ServiceName: stringPointer("AwesomeService"),
                         Methods: map[uint32]mojom_types.MojomMethod{
                                 0: mojom_types.MojomMethod{
                                         DeclData: newDeclData(test.fileNameA(), "DoIt", ""),
                                         Parameters: mojom_types.MojomStruct{
                                                 DeclData: newDeclData(test.fileNameA(), "DoIt-request", ""),
                                                 Fields: []mojom_types.StructField{
                                                         mojom_types.StructField{
-                                                                DeclData: newDeclData(test.fileNameA(), "x", ""),
+                                                                DeclData: newDeclDataO(0, -1, test.fileNameA(), "x", ""),
                                                                 Type: &mojom_types.TypeTypeReference{mojom_types.TypeReference{
                                                                         false, false, stringPointer("FooA"), stringPointer("TYPE_KEY:a.b.c.FooA")}},
                                                         },
                                                 },
                                         },
                                         ResponseParams: &mojom_types.MojomStruct{
                                                 DeclData: newDeclData(test.fileNameA(), "DoIt-response", ""),
                                                 Fields: []mojom_types.StructField{
                                                         mojom_types.StructField{
-                                                                DeclData: newDeclData(test.fileNameA(), "y", ""),
+                                                                DeclData: newDeclDataO(0, -1, test.fileNameA(), "y", ""),
                                                                 Type: &mojom_types.TypeTypeReference{mojom_types.TypeReference{
                                                                         true, false, stringPointer("b.c.d.FooB"), stringPointer("TYPE_KEY:b.c.d.FooB")}},
                                                         },
                                                 },
                                         },
                                 },
                         },
                 }}
 
                 ////////////////////////////////////////////////////////////////////////
 
                 // TypeMap for file B
 
                 // FooA
                 test.expectedRuntimeTypeInfoB().TypeMap["TYPE_KEY:b.c.d.FooB"] = &mojom_types.UserDefinedTypeStructType{mojom_types.MojomStruct{
                         DeclData: newDeclData(test.fileNameB(), "FooB", "b.c.d.FooB"),
                         Fields:   []mojom_types.StructField{}}}
 
                 // InterfaceB
                 test.expectedRuntimeTypeInfoB().TypeMap["TYPE_KEY:b.c.d.InterfaceB"] = &mojom_types.UserDefinedTypeInterfaceType{mojom_types.MojomInterface{
                         DeclData: newDeclData(test.fileNameB(), "InterfaceB", "b.c.d.InterfaceB"),
                         Methods: map[uint32]mojom_types.MojomMethod{
                                 0: mojom_types.MojomMethod{
                                         DeclData: newDeclData(test.fileNameB(), "DoIt", ""),
                                         Parameters: mojom_types.MojomStruct{
                                                 DeclData: newDeclData(test.fileNameB(), "DoIt-request", ""),
                                                 Fields: []mojom_types.StructField{
                                                         mojom_types.StructField{
-                                                                DeclData: newDeclData(test.fileNameB(), "x", ""),
+                                                                DeclData: newDeclDataO(0, -1, test.fileNameB(), "x", ""),
                                                                 Type: &mojom_types.TypeTypeReference{mojom_types.TypeReference{
                                                                         false, false, stringPointer("a.b.c.FooA"), stringPointer("TYPE_KEY:a.b.c.FooA")}},
                                                         },
                                                 },
                                         },
                                         ResponseParams: &mojom_types.MojomStruct{
                                                 DeclData: newDeclData(test.fileNameB(), "DoIt-response", ""),
                                                 Fields: []mojom_types.StructField{
                                                         mojom_types.StructField{
-                                                                DeclData: newDeclData(test.fileNameB(), "y", ""),
+                                                                DeclData: newDeclDataO(0, -1, test.fileNameB(), "y", ""),
                                                                 Type: &mojom_types.TypeTypeReference{mojom_types.TypeReference{
                                                                         true, false, stringPointer("FooB"), stringPointer("TYPE_KEY:b.c.d.FooB")}},
                                                         },
                                                 },
                                         },
                                 },
                         },
                 }}
 
                 test.endTestCase()
@@ skipping 50 matching lines @@
                                         {"ServiceName", &mojom_types.LiteralValueStringValue{"AwesomeService"}},
                                         {"Height", &mojom_types.LiteralValueDoubleValue{10.1}}}),
                         ServiceName: stringPointer("AwesomeService"),
                         Methods: map[uint32]mojom_types.MojomMethod{
                                 0: mojom_types.MojomMethod{
                                         DeclData: newDeclData(test.fileNameA(), "DoIt", ""),
                                         Parameters: mojom_types.MojomStruct{
                                                 DeclData: newDeclData(test.fileNameA(), "DoIt-request", ""),
                                                 Fields: []mojom_types.StructField{
                                                         mojom_types.StructField{
-                                                                DeclData: newDeclData(test.fileNameA(), "x", ""),
+                                                                DeclData: newDeclDataO(0, -1, test.fileNameA(), "x", ""),
                                                                 Type: &mojom_types.TypeTypeReference{mojom_types.TypeReference{
                                                                         false, false, stringPointer("FooA"), stringPointer("TYPE_KEY:a.b.c.FooA")}},
                                                         },
                                                 },
                                         },
                                         ResponseParams: &mojom_types.MojomStruct{
                                                 DeclData: newDeclData(test.fileNameA(), "DoIt-response", ""),
                                                 Fields: []mojom_types.StructField{
                                                         mojom_types.StructField{
-                                                                DeclData: newDeclData(test.fileNameA(), "y", ""),
+                                                                DeclData: newDeclDataO(0, -1, test.fileNameA(), "y", ""),
                                                                 Type: &mojom_types.TypeTypeReference{mojom_types.TypeReference{
                                                                         true, false, stringPointer("b.c.d.FooB"), stringPointer("TYPE_KEY:b.c.d.FooB")}},
                                                         },
                                                 },
                                         },
                                 },
                         },
                 }}
 
                 ////////////////////////////////////////////////////////////////////////
 
                 // TypeMap for file B
 
                 // FooA
                 test.expectedRuntimeTypeInfoB().TypeMap["TYPE_KEY:b.c.d.FooB"] = &mojom_types.UserDefinedTypeStructType{mojom_types.MojomStruct{
                         DeclData: newDeclData(test.fileNameB(), "FooB", "b.c.d.FooB"),
                         Fields:   []mojom_types.StructField{}}}
 
                 // InterfaceB
                 test.expectedRuntimeTypeInfoB().TypeMap["TYPE_KEY:b.c.d.InterfaceB"] = &mojom_types.UserDefinedTypeInterfaceType{mojom_types.MojomInterface{
                         DeclData: newDeclDataA(test.fileNameB(), "InterfaceB", "b.c.d.InterfaceB",
                                 &[]mojom_types.Attribute{{"ServiceName", &mojom_types.LiteralValueInt8Value{42}}}),
                         Methods: map[uint32]mojom_types.MojomMethod{
                                 0: mojom_types.MojomMethod{
                                         DeclData: newDeclData(test.fileNameB(), "DoIt", ""),
                                         Parameters: mojom_types.MojomStruct{
                                                 DeclData: newDeclData(test.fileNameB(), "DoIt-request", ""),
                                                 Fields: []mojom_types.StructField{
                                                         mojom_types.StructField{
-                                                                DeclData: newDeclData(test.fileNameB(), "x", ""),
+                                                                DeclData: newDeclDataO(0, -1, test.fileNameB(), "x", ""),
                                                                 Type: &mojom_types.TypeTypeReference{mojom_types.TypeReference{
                                                                         false, false, stringPointer("a.b.c.FooA"), stringPointer("TYPE_KEY:a.b.c.FooA")}},
                                                         },
                                                 },
                                         },
                                         ResponseParams: &mojom_types.MojomStruct{
                                                 DeclData: newDeclData(test.fileNameB(), "DoIt-response", ""),
                                                 Fields: []mojom_types.StructField{
                                                         mojom_types.StructField{
-                                                                DeclData: newDeclData(test.fileNameB(), "y", ""),
+                                                                DeclData: newDeclDataO(0, -1, test.fileNameB(), "y", ""),
                                                                 Type: &mojom_types.TypeTypeReference{mojom_types.TypeReference{
                                                                         true, false, stringPointer("FooB"), stringPointer("TYPE_KEY:b.c.d.FooB")}},
                                                         },
                                                 },
                                         },
                                 },
                         },
                 }}
 
                 test.endTestCase()
@@ skipping 50 matching lines @@
                         DeclData: newDeclDataA(test.fileNameA(), "InterfaceA", "a.b.c.InterfaceA",
                                 &[]mojom_types.Attribute{{"ServiceName", &mojom_types.LiteralValueStringValue{"AwesomeService"}}}),
                         ServiceName: stringPointer("AwesomeService"),
                         Methods: map[uint32]mojom_types.MojomMethod{
                                 0: mojom_types.MojomMethod{
                                         DeclData: newDeclData(test.fileNameA(), "DoIt", ""),
                                         Parameters: mojom_types.MojomStruct{
                                                 DeclData: newDeclData(test.fileNameA(), "DoIt-request", ""),
                                                 Fields: []mojom_types.StructField{
                                                         mojom_types.StructField{
-                                                                DeclData: newDeclData(test.fileNameA(), "x", ""),
+                                                                DeclData: newDeclDataO(0, -1, test.fileNameA(), "x", ""),
                                                                 Type: &mojom_types.TypeTypeReference{mojom_types.TypeReference{
                                                                         false, false, stringPointer("FooA"), stringPointer("TYPE_KEY:a.b.c.FooA")}},
                                                         },
                                                 },
                                         },
                                         ResponseParams: &mojom_types.MojomStruct{
                                                 DeclData: newDeclData(test.fileNameA(), "DoIt-response", ""),
                                                 Fields: []mojom_types.StructField{
                                                         mojom_types.StructField{
-                                                                DeclData: newDeclData(test.fileNameA(), "y", ""),
+                                                                DeclData: newDeclDataO(0, -1, test.fileNameA(), "y", ""),
                                                                 Type: &mojom_types.TypeTypeReference{mojom_types.TypeReference{
                                                                         true, false, stringPointer("b.c.d.FooB"), stringPointer("TYPE_KEY:b.c.d.FooB")}},
                                                         },
                                                 },
                                         },
                                 },
                         },
                 }}
 
                 ////////////////////////////////////////////////////////////////////////
@@ skipping 10 matching lines @@
                 test.expectedRuntimeTypeInfoB().TypeMap["TYPE_KEY:b.c.d.Enum2"] = &mojom_types.UserDefinedTypeEnumType{mojom_types.MojomEnum{
                         DeclData: newDeclData(test.fileNameB(), "Enum2", "b.c.d.Enum2"),
                         Values:   []mojom_types.EnumValue{},
                 }}
 
                 // FooA
                 test.expectedRuntimeTypeInfoB().TypeMap["TYPE_KEY:b.c.d.FooB"] = &mojom_types.UserDefinedTypeStructType{mojom_types.MojomStruct{
                         DeclData: newDeclData(test.fileNameB(), "FooB", "b.c.d.FooB"),
                         Fields: []mojom_types.StructField{
                                 mojom_types.StructField{
-                                        DeclData: newDeclData(test.fileNameB(), "x", ""),
+                                        DeclData: newDeclDataO(0, -1, test.fileNameB(), "x", ""),
                                         Type: &mojom_types.TypeTypeReference{mojom_types.TypeReference{
                                                 false, false, stringPointer("Enum1"), stringPointer("TYPE_KEY:b.c.d.Enum1")}},
                                 },
                         },
                 }}
 
                 // InterfaceB
                 test.expectedRuntimeTypeInfoB().TypeMap["TYPE_KEY:b.c.d.InterfaceB"] = &mojom_types.UserDefinedTypeInterfaceType{mojom_types.MojomInterface{
                         DeclData: newDeclData(test.fileNameB(), "InterfaceB", "b.c.d.InterfaceB"),
                         Methods: map[uint32]mojom_types.MojomMethod{
                                 0: mojom_types.MojomMethod{
                                         DeclData: newDeclData(test.fileNameB(), "DoIt", ""),
                                         Parameters: mojom_types.MojomStruct{
                                                 DeclData: newDeclData(test.fileNameB(), "DoIt-request", ""),
                                                 Fields: []mojom_types.StructField{
                                                         mojom_types.StructField{
-                                                                DeclData: newDeclData(test.fileNameB(), "x", ""),
+                                                                DeclData: newDeclDataO(0, -1, test.fileNameB(), "x", ""),
                                                                 Type: &mojom_types.TypeTypeReference{mojom_types.TypeReference{
                                                                         false, false, stringPointer("a.b.c.FooA"), stringPointer("TYPE_KEY:a.b.c.FooA")}},
                                                         },
                                                 },
                                         },
                                         ResponseParams: &mojom_types.MojomStruct{
                                                 DeclData: newDeclData(test.fileNameB(), "DoIt-response", ""),
                                                 Fields: []mojom_types.StructField{
                                                         mojom_types.StructField{
-                                                                DeclData: newDeclData(test.fileNameB(), "y", ""),
+                                                                DeclData: newDeclDataO(0, -1, test.fileNameB(), "y", ""),
                                                                 Type: &mojom_types.TypeTypeReference{mojom_types.TypeReference{
                                                                         true, false, stringPointer("FooB"), stringPointer("TYPE_KEY:b.c.d.FooB")}},
                                                         },
                                                         mojom_types.StructField{
-                                                                DeclData: newDeclData(test.fileNameB(), "z", ""),
+                                                                DeclData: newDeclDataO(1, -1, test.fileNameB(), "z", ""),
                                                                 Type: &mojom_types.TypeTypeReference{mojom_types.TypeReference{
                                                                         false, false, stringPointer("Enum2"), stringPointer("TYPE_KEY:b.c.d.Enum2")}},
                                                         },
                                                 },
                                         },
                                 },
                         },
                 }}
 
                 test.endTestCase()
@@ skipping 99 matching lines @@
                         }
                         return fmt.Errorf("*****\nexpected=\n*****\n%q\n*****\nactual=\n*****\n%q\n*****\n"+
                                 "match failed at position %d: expected=\n*****\n%q\n******\nactual=\n*****\n%q\n******\n",
                                 expectedString, actualString, diffPos, mismatchExpected, mismatchActual)
                 } else {
                         return fmt.Errorf("expected != actual but the two printed equal.")
                 }
         }
         return nil
 }