From 4fe330fff4481164f4733a2d4431c890dbd6d5e9 Mon Sep 17 00:00:00 2001 From: Ben Clayton Date: Thu, 13 Oct 2022 13:33:25 +0000 Subject: [PATCH] tint: s/analysing/analyzing Tint uses american spelling. Change-Id: Ibd3b425cb217db5b43f20cc64c6f3876233ec16e Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/105621 Reviewed-by: Dan Sinclair Commit-Queue: Ben Clayton Auto-Submit: Ben Clayton Kokoro: Kokoro --- .../resolver/address_space_validation_test.cc | 6 ++--- .../resolver/attribute_validation_test.cc | 2 +- src/tint/resolver/builtins_validation_test.cc | 2 +- .../resolver/entry_point_validation_test.cc | 22 +++++++++---------- .../host_shareable_validation_test.cc | 14 ++++++------ src/tint/resolver/resolver.cc | 4 ++-- src/tint/resolver/validator.cc | 2 +- src/tint/resolver/variable_validation_test.cc | 2 +- 8 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/tint/resolver/address_space_validation_test.cc b/src/tint/resolver/address_space_validation_test.cc index ae68013fe4..3ef19a652c 100644 --- a/src/tint/resolver/address_space_validation_test.cc +++ b/src/tint/resolver/address_space_validation_test.cc @@ -61,7 +61,7 @@ TEST_F(ResolverAddressSpaceValidationTest, Private_RuntimeArrayInStruct) { EXPECT_FALSE(r()->Resolve()); EXPECT_EQ(r()->error(), R"(12:34 error: runtime-sized arrays can only be used in the address space -note: while analysing structure member S.m +note: while analyzing structure member S.m 12:34 note: while instantiating 'var' v)"); } @@ -81,7 +81,7 @@ TEST_F(ResolverAddressSpaceValidationTest, Workgroup_RuntimeArrayInStruct) { EXPECT_FALSE(r()->Resolve()); EXPECT_EQ(r()->error(), R"(12:34 error: runtime-sized arrays can only be used in the address space -note: while analysing structure member S.m +note: while analyzing structure member S.m 12:34 note: while instantiating 'var' v)"); } @@ -317,7 +317,7 @@ TEST_F(ResolverAddressSpaceValidationTest, UniformBuffer_Struct_Runtime) { ASSERT_FALSE(r()->Resolve()); EXPECT_EQ(r()->error(), R"(56:78 error: runtime-sized arrays can only be used in the address space -note: while analysing structure member S.m +note: while analyzing structure member S.m 56:78 note: while instantiating 'var' svar)"); } diff --git a/src/tint/resolver/attribute_validation_test.cc b/src/tint/resolver/attribute_validation_test.cc index dbc9b5dd07..bd965f7f3c 100644 --- a/src/tint/resolver/attribute_validation_test.cc +++ b/src/tint/resolver/attribute_validation_test.cc @@ -1433,7 +1433,7 @@ TEST_F(InterpolateTest, VertexOutput_Integer_MissingFlatInterpolation) { EXPECT_EQ( r()->error(), R"(12:34 error: integral user-defined vertex outputs must have a flat interpolation attribute -note: while analysing entry point 'main')"); +note: while analyzing entry point 'main')"); } TEST_F(InterpolateTest, MissingLocationAttribute_Parameter) { diff --git a/src/tint/resolver/builtins_validation_test.cc b/src/tint/resolver/builtins_validation_test.cc index f2bf19193e..7190ef1321 100644 --- a/src/tint/resolver/builtins_validation_test.cc +++ b/src/tint/resolver/builtins_validation_test.cc @@ -204,7 +204,7 @@ TEST_F(ResolverBuiltinsValidationTest, FragDepthIsInputStruct_Fail) { EXPECT_EQ(r()->error(), "12:34 error: builtin(frag_depth) cannot be used in input of " "fragment pipeline stage\n" - "note: while analysing entry point 'fragShader'"); + "note: while analyzing entry point 'fragShader'"); } TEST_F(ResolverBuiltinsValidationTest, StructBuiltinInsideEntryPoint_Ignored) { diff --git a/src/tint/resolver/entry_point_validation_test.cc b/src/tint/resolver/entry_point_validation_test.cc index 2a9f25bdb5..79b41d7b66 100644 --- a/src/tint/resolver/entry_point_validation_test.cc +++ b/src/tint/resolver/entry_point_validation_test.cc @@ -170,7 +170,7 @@ TEST_F(ResolverEntryPointValidationTest, ReturnType_Struct_MemberMultipleAttribu EXPECT_FALSE(r()->Resolve()); EXPECT_EQ(r()->error(), R"(14:52 error: multiple entry point IO attributes 13:43 note: previously consumed location(0) -12:34 note: while analysing entry point 'main')"); +12:34 note: while analyzing entry point 'main')"); } TEST_F(ResolverEntryPointValidationTest, ReturnType_Struct_MemberMissingAttribute) { @@ -198,7 +198,7 @@ TEST_F(ResolverEntryPointValidationTest, ReturnType_Struct_MemberMissingAttribut EXPECT_FALSE(r()->Resolve()); EXPECT_EQ(r()->error(), R"(14:52 error: missing entry point IO attribute -12:34 note: while analysing entry point 'main')"); +12:34 note: while analyzing entry point 'main')"); } TEST_F(ResolverEntryPointValidationTest, ReturnType_Struct_DuplicateBuiltins) { @@ -227,7 +227,7 @@ TEST_F(ResolverEntryPointValidationTest, ReturnType_Struct_DuplicateBuiltins) { EXPECT_EQ( r()->error(), R"(12:34 error: builtin(frag_depth) attribute appears multiple times as pipeline output -12:34 note: while analysing entry point 'main')"); +12:34 note: while analyzing entry point 'main')"); } TEST_F(ResolverEntryPointValidationTest, ParameterAttribute_Location) { @@ -339,7 +339,7 @@ TEST_F(ResolverEntryPointValidationTest, Parameter_Struct_MemberMultipleAttribut EXPECT_FALSE(r()->Resolve()); EXPECT_EQ(r()->error(), R"(14:52 error: multiple entry point IO attributes 13:43 note: previously consumed location(0) -12:34 note: while analysing entry point 'main')"); +12:34 note: while analyzing entry point 'main')"); } TEST_F(ResolverEntryPointValidationTest, Parameter_Struct_MemberMissingAttribute) { @@ -366,7 +366,7 @@ TEST_F(ResolverEntryPointValidationTest, Parameter_Struct_MemberMissingAttribute EXPECT_FALSE(r()->Resolve()); EXPECT_EQ(r()->error(), R"(14:52 error: missing entry point IO attribute -12:34 note: while analysing entry point 'main')"); +12:34 note: while analyzing entry point 'main')"); } TEST_F(ResolverEntryPointValidationTest, Parameter_DuplicateBuiltins) { @@ -432,7 +432,7 @@ TEST_F(ResolverEntryPointValidationTest, Parameter_Struct_DuplicateBuiltins) { EXPECT_EQ( r()->error(), R"(12:34 error: builtin(sample_index) attribute appears multiple times as pipeline input -12:34 note: while analysing entry point 'main')"); +12:34 note: while analyzing entry point 'main')"); } TEST_F(ResolverEntryPointValidationTest, VertexShaderMustReturnPosition) { @@ -873,7 +873,7 @@ TEST_F(LocationAttributeTests, BadType_Input_Struct_NestedStruct) { EXPECT_FALSE(r()->Resolve()); EXPECT_EQ(r()->error(), "14:52 error: nested structures cannot be used for entry point IO\n" - "12:34 note: while analysing entry point 'main'"); + "12:34 note: while analyzing entry point 'main'"); } TEST_F(LocationAttributeTests, BadType_Input_Struct_RuntimeArray) { @@ -1059,7 +1059,7 @@ TEST_F(LocationAttributeTests, ReturnType_Struct_NestedStruct) { EXPECT_FALSE(r()->Resolve()); EXPECT_EQ(r()->error(), "14:52 error: nested structures cannot be used for entry point IO\n" - "12:34 note: while analysing entry point 'main'"); + "12:34 note: while analyzing entry point 'main'"); } TEST_F(LocationAttributeTests, ReturnType_Struct_RuntimeArray) { @@ -1140,7 +1140,7 @@ TEST_F(LocationAttributeTests, ComputeShaderLocationStructMember_Output) { EXPECT_FALSE(r()->Resolve()); EXPECT_EQ(r()->error(), "12:34 error: attribute is not valid for compute shader output\n" - "56:78 note: while analysing entry point 'main'"); + "56:78 note: while analyzing entry point 'main'"); } TEST_F(LocationAttributeTests, ComputeShaderLocationStructMember_Input) { @@ -1159,7 +1159,7 @@ TEST_F(LocationAttributeTests, ComputeShaderLocationStructMember_Input) { EXPECT_FALSE(r()->Resolve()); EXPECT_EQ(r()->error(), "12:34 error: attribute is not valid for compute shader inputs\n" - "56:78 note: while analysing entry point 'main'"); + "56:78 note: while analyzing entry point 'main'"); } TEST_F(LocationAttributeTests, Duplicate_input) { @@ -1219,7 +1219,7 @@ TEST_F(LocationAttributeTests, Duplicate_struct) { EXPECT_FALSE(r()->Resolve()); EXPECT_EQ(r()->error(), "34:56 error: location(1) attribute appears multiple times\n" - "12:34 note: while analysing entry point 'main'"); + "12:34 note: while analyzing entry point 'main'"); } } // namespace diff --git a/src/tint/resolver/host_shareable_validation_test.cc b/src/tint/resolver/host_shareable_validation_test.cc index bd8f3ca835..97519cdb16 100644 --- a/src/tint/resolver/host_shareable_validation_test.cc +++ b/src/tint/resolver/host_shareable_validation_test.cc @@ -36,7 +36,7 @@ TEST_F(ResolverHostShareableValidationTest, BoolMember) { EXPECT_EQ( r()->error(), R"(56:78 error: Type 'bool' cannot be used in address space 'storage' as it is non-host-shareable -12:34 note: while analysing structure member S.x +12:34 note: while analyzing structure member S.x 56:78 note: while instantiating 'var' g)"); } @@ -51,7 +51,7 @@ TEST_F(ResolverHostShareableValidationTest, BoolVectorMember) { EXPECT_EQ( r()->error(), R"(56:78 error: Type 'vec3' cannot be used in address space 'storage' as it is non-host-shareable -12:34 note: while analysing structure member S.x +12:34 note: while analyzing structure member S.x 56:78 note: while instantiating 'var' g)"); } @@ -67,7 +67,7 @@ TEST_F(ResolverHostShareableValidationTest, Aliases) { EXPECT_EQ( r()->error(), R"(56:78 error: Type 'bool' cannot be used in address space 'storage' as it is non-host-shareable -12:34 note: while analysing structure member S.x +12:34 note: while analyzing structure member S.x 56:78 note: while instantiating 'var' g)"); } @@ -86,10 +86,10 @@ TEST_F(ResolverHostShareableValidationTest, NestedStructures) { EXPECT_EQ( r()->error(), R"(9:10 error: Type 'bool' cannot be used in address space 'storage' as it is non-host-shareable -1:2 note: while analysing structure member I1.x -3:4 note: while analysing structure member I2.y -5:6 note: while analysing structure member I3.z -7:8 note: while analysing structure member S.m +1:2 note: while analyzing structure member I1.x +3:4 note: while analyzing structure member I2.y +5:6 note: while analyzing structure member I3.z +7:8 note: while analyzing structure member S.m 9:10 note: while instantiating 'var' g)"); } diff --git a/src/tint/resolver/resolver.cc b/src/tint/resolver/resolver.cc index e51f81462b..6842a1488f 100644 --- a/src/tint/resolver/resolver.cc +++ b/src/tint/resolver/resolver.cc @@ -2768,7 +2768,7 @@ sem::Struct* Resolver::Structure(const ast::Struct* str) { // For alignment, use the alignment attribute if provided, otherwise use the // default alignment for the member type. // Diagnostic errors are raised if a basic rule is violated. - // Validation of storage-class rules requires analysing the actual variable + // Validation of storage-class rules requires analyzing the actual variable // usage of the structure, and so is performed as part of the variable // validation. uint64_t struct_size = 0; @@ -3238,7 +3238,7 @@ bool Resolver::ApplyAddressSpaceUsageToType(ast::AddressSpace address_space, if (!ApplyAddressSpaceUsageToType(address_space, const_cast(member->Type()), usage)) { std::stringstream err; - err << "while analysing structure member " << sem_.TypeNameOf(str) << "." + err << "while analyzing structure member " << sem_.TypeNameOf(str) << "." << builder_->Symbols().NameFor(member->Declaration()->symbol); AddNote(err.str(), member->Declaration()->source); return false; diff --git a/src/tint/resolver/validator.cc b/src/tint/resolver/validator.cc index 6b6b179e38..3f58e855f1 100644 --- a/src/tint/resolver/validator.cc +++ b/src/tint/resolver/validator.cc @@ -1299,7 +1299,7 @@ bool Validator::EntryPoint(const sem::Function* func, ast::PipelineStage stage) member->Declaration()->attributes, member->Type(), member->Declaration()->source, param_or_ret, /*is_struct_member*/ true, member->Location())) { - AddNote("while analysing entry point '" + symbols_.NameFor(decl->symbol) + "'", + AddNote("while analyzing entry point '" + symbols_.NameFor(decl->symbol) + "'", decl->source); return false; } diff --git a/src/tint/resolver/variable_validation_test.cc b/src/tint/resolver/variable_validation_test.cc index 28f8dc343c..72d6a6d5ee 100644 --- a/src/tint/resolver/variable_validation_test.cc +++ b/src/tint/resolver/variable_validation_test.cc @@ -329,7 +329,7 @@ TEST_F(ResolverVariableValidationTest, NonConstructibleType_RuntimeArray) { EXPECT_FALSE(r()->Resolve()); EXPECT_EQ(r()->error(), R"(12:34 error: runtime-sized arrays can only be used in the address space -56:78 note: while analysing structure member S.m +56:78 note: while analyzing structure member S.m 12:34 note: while instantiating 'var' v)"); }