From 369c54ec4d40fca1ce73acf30e8375a4f84df385 Mon Sep 17 00:00:00 2001 From: Vadim Godunko Date: Wed, 10 Jan 2024 18:38:19 +0400 Subject: [PATCH] Rename global objects to have To_ prefix. --- .../vss-regular_expressions-name_sets.adb | 2 +- source/text/vss-transformers-casing.ads | 8 ++-- .../text/vss-transformers-normalization.ads | 8 ++-- .../test_transformer-test_casing_minimal.adb | 32 ++++++++------- .../test_transformer-test_casing_w3c_i18n.adb | 4 +- ...transformer-test_ucd_normalizationtest.adb | 40 +++++++++---------- 6 files changed, 49 insertions(+), 45 deletions(-) diff --git a/source/regexp/implementation/vss-regular_expressions-name_sets.adb b/source/regexp/implementation/vss-regular_expressions-name_sets.adb index a20e3b23..8166e43b 100644 --- a/source/regexp/implementation/vss-regular_expressions-name_sets.adb +++ b/source/regexp/implementation/vss-regular_expressions-name_sets.adb @@ -64,7 +64,7 @@ package body VSS.Regular_Expressions.Name_Sets is Cursor := Map.Find - (VSS.Transformers.Casing.Simple_Lowercase.Transform (Name)); + (VSS.Transformers.Casing.To_Simple_Lowercase.Transform (Name)); if Category_Maps.Maps.Has_Element (Cursor) then Value := Category_Maps.Maps.Element (Cursor); diff --git a/source/text/vss-transformers-casing.ads b/source/text/vss-transformers-casing.ads index 0b95ba92..4d121b3b 100644 --- a/source/text/vss-transformers-casing.ads +++ b/source/text/vss-transformers-casing.ads @@ -90,13 +90,13 @@ package VSS.Transformers.Casing is Item : in out VSS.Strings.Virtual_String'Class); -- @private - Lowercase : constant Lowercase_Transformer := + To_Lowercase : constant Lowercase_Transformer := Lowercase_Transformer'(null record); - Simple_Lowercase : constant Simple_Lowercase_Transformer := + To_Simple_Lowercase : constant Simple_Lowercase_Transformer := Simple_Lowercase_Transformer'(null record); - Simple_Uppercase : constant Simple_Uppercase_Transformer := + To_Simple_Uppercase : constant Simple_Uppercase_Transformer := Simple_Uppercase_Transformer'(null record); - Uppercase : constant Uppercase_Transformer := + To_Uppercase : constant Uppercase_Transformer := Uppercase_Transformer'(null record); -- Lowercase : constant Abstract_Transformer'Class := diff --git a/source/text/vss-transformers-normalization.ads b/source/text/vss-transformers-normalization.ads index e7f2ce03..fc146d30 100644 --- a/source/text/vss-transformers-normalization.ads +++ b/source/text/vss-transformers-normalization.ads @@ -88,13 +88,13 @@ package VSS.Transformers.Normalization is Item : in out VSS.Strings.Virtual_String'Class); -- @private - Normalization_Form_D : constant Normalization_Form_D_Transformer := + To_Normalization_Form_D : constant Normalization_Form_D_Transformer := Normalization_Form_D_Transformer'(null record); - Normalization_Form_C : constant Normalization_Form_C_Transformer := + To_Normalization_Form_C : constant Normalization_Form_C_Transformer := Normalization_Form_C_Transformer'(null record); - Normalization_Form_KD : constant Normalization_Form_KD_Transformer := + To_Normalization_Form_KD : constant Normalization_Form_KD_Transformer := Normalization_Form_KD_Transformer'(null record); - Normalization_Form_KC : constant Normalization_Form_KC_Transformer := + To_Normalization_Form_KC : constant Normalization_Form_KC_Transformer := Normalization_Form_KC_Transformer'(null record); -- Normalization_Form_D : constant Abstract_Transformer'Class := diff --git a/testsuite/text/test_transformer-test_casing_minimal.adb b/testsuite/text/test_transformer-test_casing_minimal.adb index 40931c72..af82dc92 100644 --- a/testsuite/text/test_transformer-test_casing_minimal.adb +++ b/testsuite/text/test_transformer-test_casing_minimal.adb @@ -54,35 +54,39 @@ procedure Test_Casing_Minimal is VSS.Strings.Empty_Virtual_String; begin - Test_Support.Assert (VSS.Transformers.Casing.Lowercase.Transform (S1) = E1); Test_Support.Assert - (VSS.Transformers.Casing.Lowercase.Transform (S1S) = S1E); + (VSS.Transformers.Casing.To_Lowercase.Transform (S1) = E1); Test_Support.Assert - (VSS.Transformers.Casing.Lowercase.Transform (S2S) = S2E); + (VSS.Transformers.Casing.To_Lowercase.Transform (S1S) = S1E); Test_Support.Assert - (VSS.Transformers.Casing.Lowercase.Transform (S3S) = S3E); + (VSS.Transformers.Casing.To_Lowercase.Transform (S2S) = S2E); Test_Support.Assert - (VSS.Transformers.Casing.Lowercase.Transform (S4S) = S4E); + (VSS.Transformers.Casing.To_Lowercase.Transform (S3S) = S3E); Test_Support.Assert - (VSS.Transformers.Casing.Lowercase.Transform (S5S) = S5E); + (VSS.Transformers.Casing.To_Lowercase.Transform (S4S) = S4E); Test_Support.Assert - (VSS.Transformers.Casing.Lowercase.Transform (S6S) = S6E); + (VSS.Transformers.Casing.To_Lowercase.Transform (S5S) = S5E); + Test_Support.Assert + (VSS.Transformers.Casing.To_Lowercase.Transform (S6S) = S6E); - Test_Support.Assert (VSS.Transformers.Casing.Lowercase.Transform (U1) = L1); - Test_Support.Assert (VSS.Transformers.Casing.Uppercase.Transform (L1) = U1); + Test_Support.Assert + (VSS.Transformers.Casing.To_Lowercase.Transform (U1) = L1); + Test_Support.Assert + (VSS.Transformers.Casing.To_Uppercase.Transform (L1) = U1); -- Test for null string for code coverage of Null_String_Handler. - Test_Support.Assert (VSS.Transformers.Casing.Lowercase.Transform (SN) = SN); + Test_Support.Assert + (VSS.Transformers.Casing.To_Lowercase.Transform (SN) = SN); -- Test of simple case conversion. Test_Support.Assert - (VSS.Transformers.Casing.Simple_Lowercase.Transform (S1) = E1); + (VSS.Transformers.Casing.To_Simple_Lowercase.Transform (S1) = E1); Test_Support.Assert - (VSS.Transformers.Casing.Simple_Uppercase.Transform (E1) = S1); + (VSS.Transformers.Casing.To_Simple_Uppercase.Transform (E1) = S1); Test_Support.Assert - (VSS.Transformers.Casing.Simple_Lowercase.Transform (U1) = L1); + (VSS.Transformers.Casing.To_Simple_Lowercase.Transform (U1) = L1); Test_Support.Assert - (VSS.Transformers.Casing.Simple_Uppercase.Transform (L1) = U1); + (VSS.Transformers.Casing.To_Simple_Uppercase.Transform (L1) = U1); end Test_Casing_Minimal; diff --git a/testsuite/text/test_transformer-test_casing_w3c_i18n.adb b/testsuite/text/test_transformer-test_casing_w3c_i18n.adb index 7059206d..aa7e2b3e 100644 --- a/testsuite/text/test_transformer-test_casing_w3c_i18n.adb +++ b/testsuite/text/test_transformer-test_casing_w3c_i18n.adb @@ -60,10 +60,10 @@ begin if Lowercase then Test_Support.Assert - (VSS.Transformers.Casing.Lowercase.Transform (Source) = Expected); + (VSS.Transformers.Casing.To_Lowercase.Transform (Source) = Expected); else Test_Support.Assert - (VSS.Transformers.Casing.Uppercase.Transform (Source) = Expected); + (VSS.Transformers.Casing.To_Uppercase.Transform (Source) = Expected); end if; end Test_Casing_W3C_I18N; diff --git a/testsuite/text/test_transformer-test_ucd_normalizationtest.adb b/testsuite/text/test_transformer-test_ucd_normalizationtest.adb index 0b3ee91d..b42e754c 100644 --- a/testsuite/text/test_transformer-test_ucd_normalizationtest.adb +++ b/testsuite/text/test_transformer-test_ucd_normalizationtest.adb @@ -71,19 +71,19 @@ begin declare C1N : constant VSS.Strings.Virtual_String := - VSS.Transformers.Normalization.Normalization_Form_C + VSS.Transformers.Normalization.To_Normalization_Form_C .Transform (C1); C2N : constant VSS.Strings.Virtual_String := - VSS.Transformers.Normalization.Normalization_Form_C + VSS.Transformers.Normalization.To_Normalization_Form_C .Transform (C2); C3N : constant VSS.Strings.Virtual_String := - VSS.Transformers.Normalization.Normalization_Form_C + VSS.Transformers.Normalization.To_Normalization_Form_C .Transform (C3); C4N : constant VSS.Strings.Virtual_String := - VSS.Transformers.Normalization.Normalization_Form_C + VSS.Transformers.Normalization.To_Normalization_Form_C .Transform (C4); C5N : constant VSS.Strings.Virtual_String := - VSS.Transformers.Normalization.Normalization_Form_C + VSS.Transformers.Normalization.To_Normalization_Form_C .Transform (C4); begin @@ -98,19 +98,19 @@ begin declare C1N : constant VSS.Strings.Virtual_String := - VSS.Transformers.Normalization.Normalization_Form_D + VSS.Transformers.Normalization.To_Normalization_Form_D .Transform (C1); C2N : constant VSS.Strings.Virtual_String := - VSS.Transformers.Normalization.Normalization_Form_D + VSS.Transformers.Normalization.To_Normalization_Form_D .Transform (C2); C3N : constant VSS.Strings.Virtual_String := - VSS.Transformers.Normalization.Normalization_Form_D + VSS.Transformers.Normalization.To_Normalization_Form_D .Transform (C3); C4N : constant VSS.Strings.Virtual_String := - VSS.Transformers.Normalization.Normalization_Form_D + VSS.Transformers.Normalization.To_Normalization_Form_D .Transform (C4); C5N : constant VSS.Strings.Virtual_String := - VSS.Transformers.Normalization.Normalization_Form_D + VSS.Transformers.Normalization.To_Normalization_Form_D .Transform (C5); begin @@ -125,19 +125,19 @@ begin declare C1N : constant VSS.Strings.Virtual_String := - VSS.Transformers.Normalization.Normalization_Form_KC + VSS.Transformers.Normalization.To_Normalization_Form_KC .Transform (C1); C2N : constant VSS.Strings.Virtual_String := - VSS.Transformers.Normalization.Normalization_Form_KC + VSS.Transformers.Normalization.To_Normalization_Form_KC .Transform (C2); C3N : constant VSS.Strings.Virtual_String := - VSS.Transformers.Normalization.Normalization_Form_KC + VSS.Transformers.Normalization.To_Normalization_Form_KC .Transform (C3); C4N : constant VSS.Strings.Virtual_String := - VSS.Transformers.Normalization.Normalization_Form_KC + VSS.Transformers.Normalization.To_Normalization_Form_KC .Transform (C4); C5N : constant VSS.Strings.Virtual_String := - VSS.Transformers.Normalization.Normalization_Form_KC + VSS.Transformers.Normalization.To_Normalization_Form_KC .Transform (C5); begin @@ -152,19 +152,19 @@ begin declare C1N : constant VSS.Strings.Virtual_String := - VSS.Transformers.Normalization.Normalization_Form_KD + VSS.Transformers.Normalization.To_Normalization_Form_KD .Transform (C1); C2N : constant VSS.Strings.Virtual_String := - VSS.Transformers.Normalization.Normalization_Form_KD + VSS.Transformers.Normalization.To_Normalization_Form_KD .Transform (C2); C3N : constant VSS.Strings.Virtual_String := - VSS.Transformers.Normalization.Normalization_Form_KD + VSS.Transformers.Normalization.To_Normalization_Form_KD .Transform (C3); C4N : constant VSS.Strings.Virtual_String := - VSS.Transformers.Normalization.Normalization_Form_KD + VSS.Transformers.Normalization.To_Normalization_Form_KD .Transform (C4); C5N : constant VSS.Strings.Virtual_String := - VSS.Transformers.Normalization.Normalization_Form_KD + VSS.Transformers.Normalization.To_Normalization_Form_KD .Transform (C5); begin