Mojom frontend: Implement computeFieldOffsets().

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 (
         "bytes"
         "compress/gzip"
         "encoding/base64"
@@ skipping 1168 matching lines @@
                 // 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 x
                                 {
                                         DeclData: test.newShortDeclDataO(0, -1, "x"),
                                         Type:     &mojom_types.TypeSimpleType{mojom_types.SimpleType_Int32},
+                                        Offset:   0,
                                 },
                                 // field y
                                 {
                                         DeclData: test.newShortDeclDataO(1, -1, "y"),
                                         Type:     &mojom_types.TypeSimpleType{mojom_types.SimpleType_Int32},
+                                        Offset:   4,
                                 },
                                 // field z
                                 {
                                         DeclData:   test.newShortDeclDataAO(2, -1, "z", &[]mojom_types.Attribute{{"MinVersion", &mojom_types.LiteralValueInt8Value{1}}}),
                                         Type:       &mojom_types.TypeArrayType{mojom_types.ArrayType{true, -1, &mojom_types.TypeSimpleType{mojom_types.SimpleType_Int32}}},
                                         MinVersion: 1,
+                                        Offset:     8,
                                 },
                                 // field w
                                 {
                                         DeclData:   test.newShortDeclDataAO(3, -1, "w", &[]mojom_types.Attribute{{"MinVersion", &mojom_types.LiteralValueInt8Value{2}}}),
                                         Type:       &mojom_types.TypeArrayType{mojom_types.ArrayType{true, -1, &mojom_types.TypeSimpleType{mojom_types.SimpleType_Int32}}},
                                         MinVersion: 2,
+                                        Offset:     16,
                                 },
                         },
                         VersionInfo: &[]mojom_types.StructVersion{
                                 mojom_types.StructVersion{
                                         VersionNumber: 0,
                                         NumFields:     2,
-                                        NumBytes:      0,
+                                        NumBytes:      16,
                                 },
                                 mojom_types.StructVersion{
                                         VersionNumber: 1,
                                         NumFields:     3,
-                                        NumBytes:      0,
+                                        NumBytes:      24,
                                 },
                                 mojom_types.StructVersion{
                                         VersionNumber: 2,
                                         NumFields:     4,
-                                        NumBytes:      0,
+                                        NumBytes:      32,
                                 },
                         },
                 }}
 
                 test.endTestCase()
         }
 
         ////////////////////////////////////////////////////////////
         // Test Case: Test struct field min versions: 1, 3
         ////////////////////////////////////////////////////////////
@@ skipping 19 matching lines @@
                 // 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 x
                                 {
                                         DeclData: test.newShortDeclDataO(0, -1, "x"),
                                         Type:     &mojom_types.TypeSimpleType{mojom_types.SimpleType_Int32},
+                                        Offset:   0,
                                 },
                                 // field y
                                 {
                                         DeclData: test.newShortDeclDataO(1, -1, "y"),
                                         Type:     &mojom_types.TypeSimpleType{mojom_types.SimpleType_Int32},
+                                        Offset:   4,
                                 },
                                 // field z
                                 {
                                         DeclData:   test.newShortDeclDataAO(2, -1, "z", &[]mojom_types.Attribute{{"MinVersion", &mojom_types.LiteralValueInt8Value{1}}}),
                                         Type:       &mojom_types.TypeArrayType{mojom_types.ArrayType{true, -1, &mojom_types.TypeSimpleType{mojom_types.SimpleType_Int32}}},
                                         MinVersion: 1,
+                                        Offset:     8,
                                 },
                                 // field w
                                 {
                                         DeclData:   test.newShortDeclDataAO(3, -1, "w", &[]mojom_types.Attribute{{"MinVersion", &mojom_types.LiteralValueInt8Value{3}}}),
                                         Type:       &mojom_types.TypeArrayType{mojom_types.ArrayType{true, -1, &mojom_types.TypeSimpleType{mojom_types.SimpleType_Int32}}},
                                         MinVersion: 3,
+                                        Offset:     16,
                                 },
                         },
                         VersionInfo: &[]mojom_types.StructVersion{
                                 mojom_types.StructVersion{
                                         VersionNumber: 0,
                                         NumFields:     2,
-                                        NumBytes:      0,
+                                        NumBytes:      16,
                                 },
                                 mojom_types.StructVersion{
                                         VersionNumber: 1,
                                         NumFields:     3,
-                                        NumBytes:      0,
+                                        NumBytes:      24,
                                 },
                                 mojom_types.StructVersion{
                                         VersionNumber: 3,
                                         NumFields:     4,
-                                        NumBytes:      0,
+                                        NumBytes:      32,
                                 },
                         },
                 }}
 
                 test.endTestCase()
         }
 
         ////////////////////////////////////////////////////////////
         // Test Case: Test struct field min versions: 1, 1
         ////////////////////////////////////////////////////////////
@@ skipping 19 matching lines @@
                 // 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 x
                                 {
                                         DeclData: test.newShortDeclDataO(0, -1, "x"),
                                         Type:     &mojom_types.TypeSimpleType{mojom_types.SimpleType_Int32},
+                                        Offset:   0,
                                 },
                                 // field y
                                 {
                                         DeclData: test.newShortDeclDataO(1, -1, "y"),
                                         Type:     &mojom_types.TypeSimpleType{mojom_types.SimpleType_Int32},
+                                        Offset:   4,
                                 },
                                 // field z
                                 {
                                         DeclData:   test.newShortDeclDataAO(2, -1, "z", &[]mojom_types.Attribute{{"MinVersion", &mojom_types.LiteralValueInt8Value{1}}}),
                                         Type:       &mojom_types.TypeArrayType{mojom_types.ArrayType{true, -1, &mojom_types.TypeSimpleType{mojom_types.SimpleType_Int32}}},
                                         MinVersion: 1,
+                                        Offset:     8,
                                 },
                                 // field w
                                 {
                                         DeclData:   test.newShortDeclDataAO(3, -1, "w", &[]mojom_types.Attribute{{"MinVersion", &mojom_types.LiteralValueInt8Value{1}}}),
                                         Type:       &mojom_types.TypeArrayType{mojom_types.ArrayType{true, -1, &mojom_types.TypeSimpleType{mojom_types.SimpleType_Int32}}},
                                         MinVersion: 1,
+                                        Offset:     16,
                                 },
                         },
                         VersionInfo: &[]mojom_types.StructVersion{
                                 mojom_types.StructVersion{
                                         VersionNumber: 0,
                                         NumFields:     2,
-                                        NumBytes:      0,
+                                        NumBytes:      16,
                                 },
                                 mojom_types.StructVersion{
                                         VersionNumber: 1,
                                         NumFields:     4,
-                                        NumBytes:      0,
+                                        NumBytes:      32,
                                 },
                         },
                 }}
 
                 test.endTestCase()
         }
 
         ////////////////////////////////////////////////////////////
         // Test Case: Test struct field min versions: 1,2 with specified ordinals
         ////////////////////////////////////////////////////////////
@@ skipping 20 matching lines @@
                 // 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 x
                                 {
                                         DeclData: test.newShortDeclDataO(3, 0, "x"),
                                         Type:     &mojom_types.TypeSimpleType{mojom_types.SimpleType_Int32},
+                                        Offset:   0,
                                 },
                                 // field y
                                 {
                                         DeclData: test.newShortDeclDataO(0, 1, "y"),
                                         Type:     &mojom_types.TypeSimpleType{mojom_types.SimpleType_Int32},
+                                        Offset:   4,
                                 },
                                 // field z
                                 {
                                         DeclData:   test.newShortDeclDataAO(1, 2, "z", &[]mojom_types.Attribute{{"MinVersion", &mojom_types.LiteralValueInt8Value{1}}}),
                                         Type:       &mojom_types.TypeArrayType{mojom_types.ArrayType{true, -1, &mojom_types.TypeSimpleType{mojom_types.SimpleType_Int32}}},
                                         MinVersion: 1,
+                                        Offset:     8,
                                 },
                                 // field w
                                 {
                                         DeclData:   test.newShortDeclDataAO(2, 3, "w", &[]mojom_types.Attribute{{"MinVersion", &mojom_types.LiteralValueInt8Value{2}}}),
                                         Type:       &mojom_types.TypeArrayType{mojom_types.ArrayType{true, -1, &mojom_types.TypeSimpleType{mojom_types.SimpleType_Int32}}},
                                         MinVersion: 2,
+                                        Offset:     16,
                                 },
                         },
                         VersionInfo: &[]mojom_types.StructVersion{
                                 mojom_types.StructVersion{
                                         VersionNumber: 0,
                                         NumFields:     2,
-                                        NumBytes:      0,
+                                        NumBytes:      16,
                                 },
                                 mojom_types.StructVersion{
                                         VersionNumber: 1,
                                         NumFields:     3,
-                                        NumBytes:      0,
+                                        NumBytes:      24,
                                 },
                                 mojom_types.StructVersion{
                                         VersionNumber: 2,
                                         NumFields:     4,
-                                        NumBytes:      0,
+                                        NumBytes:      32,
                                 },
                         },
                 }}
+
+                test.endTestCase()
+        }
+
+        ////////////////////////////////////////////////////////////
+        // Test Case: 3 boolean fields
+        ////////////////////////////////////////////////////////////
+        {
+                contents := `
+        struct MyStruct1 {
+          bool b1;
+          bool b2;
+          bool b3;
+        };`
+
+                test.addTestCase("", contents)
+
+                test.expectedFile().DeclaredMojomObjects.Structs = &[]string{"TYPE_KEY:MyStruct1"}
+
+                // ResolvedTypes
+
+                // struct Foo
+                test.expectedGraph().ResolvedTypes["TYPE_KEY:MyStruct1"] = &mojom_types.UserDefinedTypeStructType{mojom_types.MojomStruct{
+                        DeclData: test.newDeclData("MyStruct1", "MyStruct1"),
+                        Fields: []mojom_types.StructField{
+                                // The fields are in ordinal order and the first two arguments to newShortDeclDataO() are
+                                // declarationOrder and declaredOrdinal.
+                                // field b1
+                                {
+                                        DeclData: test.newShortDeclDataO(0, -1, "b1"),
+                                        Type:     &mojom_types.TypeSimpleType{mojom_types.SimpleType_Bool},
+                                        Offset:   0,
+                                        Bit:      0,
+                                },
+                                // field b2
+                                {
+                                        DeclData: test.newShortDeclDataO(1, -1, "b2"),
+                                        Type:     &mojom_types.TypeSimpleType{mojom_types.SimpleType_Bool},
+                                        Offset:   0,
+                                        Bit:      1,
+                                },
+                                // field b3
+                                {
+                                        DeclData: test.newShortDeclDataO(2, -1, "b3"),
+                                        Type:     &mojom_types.TypeSimpleType{mojom_types.SimpleType_Bool},
+                                        Offset:   0,
+                                        Bit:      2,
+                                },
+                        },
+                        VersionInfo: &[]mojom_types.StructVersion{
+                                mojom_types.StructVersion{
+                                        VersionNumber: 0,
+                                        NumFields:     3,
+                                        NumBytes:      16,
+                                },
+                        },
+                }}
+
+                test.endTestCase()
+        }
+
+        ////////////////////////////////////////////////////////////
+        // Test Case: int8 field + 2 boolean fields + int32field + 2 boolean fields
+        ////////////////////////////////////////////////////////////
+        {
+                contents := `
+        struct MyStruct1 {
+          int8 x;
+
+          bool b1;
+          bool b2;
+
+          int32 y;
+
+          bool b3;
+          bool b4;
+        };`
+
+                test.addTestCase("", contents)
+
+                test.expectedFile().DeclaredMojomObjects.Structs = &[]string{"TYPE_KEY:MyStruct1"}
+
+                // ResolvedTypes
+
+                // struct Foo
+                test.expectedGraph().ResolvedTypes["TYPE_KEY:MyStruct1"] = &mojom_types.UserDefinedTypeStructType{mojom_types.MojomStruct{
+                        DeclData: test.newDeclData("MyStruct1", "MyStruct1"),
+                        Fields: []mojom_types.StructField{
+                                // The fields are in ordinal order and the first two arguments to newShortDeclDataO() are
+                                // declarationOrder and declaredOrdinal.
+                                // field x
+                                {
+                                        DeclData: test.newShortDeclDataO(0, -1, "x"),
+                                        Type:     &mojom_types.TypeSimpleType{mojom_types.SimpleType_Int8},
+                                        Offset:   0,
+                                },
+                                // field b1
+                                {
+                                        DeclData: test.newShortDeclDataO(1, -1, "b1"),
+                                        Type:     &mojom_types.TypeSimpleType{mojom_types.SimpleType_Bool},
+                                        Offset:   1,
+                                        Bit:      0,
+                                },
+                                // field b2
+                                {
+                                        DeclData: test.newShortDeclDataO(2, -1, "b2"),
+                                        Type:     &mojom_types.TypeSimpleType{mojom_types.SimpleType_Bool},
+                                        Offset:   1,
+                                        Bit:      1,
+                                },
+                                // field y
+                                {
+                                        DeclData: test.newShortDeclDataO(3, -1, "y"),
+                                        Type:     &mojom_types.TypeSimpleType{mojom_types.SimpleType_Int32},
+                                        Offset:   4,
+                                },
+                                // field b3
+                                {
+                                        DeclData: test.newShortDeclDataO(4, -1, "b3"),
+                                        Type:     &mojom_types.TypeSimpleType{mojom_types.SimpleType_Bool},
+                                        Offset:   1,
+                                        Bit:      2,
+                                },
+                                // field b4
+                                {
+                                        DeclData: test.newShortDeclDataO(5, -1, "b4"),
+                                        Type:     &mojom_types.TypeSimpleType{mojom_types.SimpleType_Bool},
+                                        Offset:   1,
+                                        Bit:      3,
+                                },
+                        },
+                        VersionInfo: &[]mojom_types.StructVersion{
+                                mojom_types.StructVersion{
+                                        VersionNumber: 0,
+                                        NumFields:     6,
+                                        NumBytes:      16,
+                                },
+                        },
+                }}
 
                 test.endTestCase()
         }
 
         ////////////////////////////////////////////////////////////
         // Execute all of the test cases.
         ////////////////////////////////////////////////////////////
         for _, c := range test.cases {
                 // Parse and resolve the mojom input.
                 descriptor := mojom.NewMojomDescriptor()
@@ skipping 1118 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
 }