ICU-22261 Add UCONFIG_NO_MF2 flag that can be used to disable Message…

…Format 2 functionality
unicode-org · Mar 28, 2024 · dd90918 · dd90918
1 parent f7d641d
commit dd90918
Show file tree

Hide file tree

Showing 37 changed files with 182 additions and 13 deletions.
diff --git a/.github/workflows/icu4c.yml b/.github/workflows/icu4c.yml
@@ -367,20 +367,21 @@ jobs:
          - "-DUCONFIG_NO_IDNA=1"
          - "-DUCONFIG_NO_COLLATION=1"
          - "-DUCONFIG_NO_FORMATTING=1"
+         - "-DUCONFIG_NO_MF2=1"
          - "-DUCONFIG_NO_TRANSLITERATION=1"
          - "-DUCONFIG_NO_REGULAR_EXPRESSIONS=1"
          - "-DUCONFIG_NO_SERVICE=1"
          - "-DUCONFIG_NO_FILTERED_BREAK_ITERATION=1"
          # Turn on all the options in one test.
-         - "-DUCONFIG_NO_LEGACY_CONVERSION=1 -DUCONFIG_NO_NORMALIZATION=1 -DUCONFIG_NO_BREAK_ITERATION=1 -DUCONFIG_NO_IDNA=1 -DUCONFIG_NO_COLLATION=1 -DUCONFIG_NO_FORMATTING=1 -DUCONFIG_NO_TRANSLITERATION=1 -DUCONFIG_NO_REGULAR_EXPRESSIONS=1 -DUCONFIG_NO_SERVICE=1 -DUCONFIG_NO_FILTERED_BREAK_ITERATION=1"
+         - "-DUCONFIG_NO_LEGACY_CONVERSION=1 -DUCONFIG_NO_NORMALIZATION=1 -DUCONFIG_NO_BREAK_ITERATION=1 -DUCONFIG_NO_IDNA=1 -DUCONFIG_NO_COLLATION=1 -DUCONFIG_NO_FORMATTING=1 -DUCONFIG_NO_MF2=1 -DUCONFIG_NO_TRANSLITERATION=1 -DUCONFIG_NO_REGULAR_EXPRESSIONS=1 -DUCONFIG_NO_SERVICE=1 -DUCONFIG_NO_FILTERED_BREAK_ITERATION=1"
     steps:
       - name: Checkout
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - name: Verify no additional new UCONFIG_NO_xxx added
         run: |
-          # Test that we have exactly 12 "#ifndef UCONFIG_NO_" in uconfig.h. If the number changes, we need to also
-          # adjust the uconfig_cppflags above to include the new one and update the "12" below.
-          expected_count="12";
+          # Test that we have exactly 13 "#ifndef UCONFIG_NO_" in uconfig.h. If the number changes, we need to also
+          # adjust the uconfig_cppflags above to include the new one and update the "13" below.
+          expected_count="13";
           count=`egrep "#ifndef UCONFIG_NO_" icu4c/source/common/unicode/uconfig.h| wc -l`;
           if [ $expected_count != $count ]; then
               echo "More than %s UCONFIG_NO_* defined in uconfig.h, please adjust uconfig_cppflags above to include any newly added flag" % $expected_count;
@@ -413,21 +414,22 @@ jobs:
          - "-DUCONFIG_NO_IDNA=1"
          - "-DUCONFIG_NO_COLLATION=1"
          - "-DUCONFIG_NO_FORMATTING=1"
+         - "-DUCONFIG_NO_MF2=1"
          - "-DUCONFIG_NO_TRANSLITERATION=1"
          - "-DUCONFIG_NO_REGULAR_EXPRESSIONS=1"
          - "-DUCONFIG_NO_SERVICE=1"
          - "-DUCONFIG_NO_FILTERED_BREAK_ITERATION=1"
          # Turn on all the options in one test.
-         - "-DUCONFIG_NO_LEGACY_CONVERSION=1 -DUCONFIG_NO_NORMALIZATION=1 -DUCONFIG_NO_BREAK_ITERATION=1 -DUCONFIG_NO_IDNA=1 -DUCONFIG_NO_COLLATION=1 -DUCONFIG_NO_FORMATTING=1 -DUCONFIG_NO_TRANSLITERATION=1 -DUCONFIG_NO_REGULAR_EXPRESSIONS=1 -DUCONFIG_NO_SERVICE=1 -DUCONFIG_NO_FILTERED_BREAK_ITERATION=1"
+         - "-DUCONFIG_NO_LEGACY_CONVERSION=1 -DUCONFIG_NO_NORMALIZATION=1 -DUCONFIG_NO_BREAK_ITERATION=1 -DUCONFIG_NO_IDNA=1 -DUCONFIG_NO_COLLATION=1 -DUCONFIG_NO_FORMATTING=1 -DUCONFIG_NO_MF2=1 -DUCONFIG_NO_TRANSLITERATION=1 -DUCONFIG_NO_REGULAR_EXPRESSIONS=1 -DUCONFIG_NO_SERVICE=1 -DUCONFIG_NO_FILTERED_BREAK_ITERATION=1"
     steps:
       - name: Checkout
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - name: Verify no additional new UCONFIG_NO_xxx added
         run: |
-          # Test that we have exactly 12 "#ifndef UCONFIG_NO_" in uconfig.h. If the number changes, we need to also
-          # adjust the uconfig_cppflags above to include the new one and update the "12" below.
+          # Test that we have exactly 13 "#ifndef UCONFIG_NO_" in uconfig.h. If the number changes, we need to also
+          # adjust the uconfig_cppflags above to include the new one and update the "13" below.
           count=`egrep "#ifndef UCONFIG_NO_" icu4c/source/common/unicode/uconfig.h| wc -l`;
-          if [ "12" != $count ]; then
+          if [ "13" != $count ]; then
               echo "More than %s UCONFIG_NO_* defined in uconfig.h, please adjust uconfig_cppflags above to include any newly added flag" % $count;
               echo "Currently UCONFIG_NO_* defined in uconfig.h:";
               egrep "#ifndef UCONFIG_NO_" icu4c/source/common/unicode/uconfig.h;

diff --git a/icu4c/source/common/unicode/uconfig.h b/icu4c/source/common/unicode/uconfig.h
@@ -413,6 +413,17 @@
 #   define UCONFIG_NO_FORMATTING 0
 #endif
 
+/**
+ * \def UCONFIG_NO_MF2
+ * This switch turns off the experimental MessageFormat 2.0 API.
+ *
+ * @internal ICU 75.0 technology preview
+ * @deprecated This API is for technology preview only.
+ */
+#ifndef UCONFIG_NO_MF2
+#   define UCONFIG_NO_MF2 0
+#endif
+
 /**
  * \def UCONFIG_NO_TRANSLITERATION
  * This switch turns off transliteration.

diff --git a/icu4c/source/i18n/messageformat2.cpp b/icu4c/source/i18n/messageformat2.cpp
@@ -5,6 +5,8 @@
 
 #if !UCONFIG_NO_FORMATTING
 
+#if !UCONFIG_NO_MF2
+
 #include "unicode/messageformat2_arguments.h"
 #include "unicode/messageformat2_data_model.h"
 #include "unicode/messageformat2_formattable.h"
@@ -871,4 +873,6 @@ void MessageFormatter::checkDeclarations(MessageContext& context, Environment*&
 
 U_NAMESPACE_END
 
+#endif /* #if !UCONFIG_NO_MF2 */
+
 #endif /* #if !UCONFIG_NO_FORMATTING */
diff --git a/icu4c/source/i18n/messageformat2_allocation.h b/icu4c/source/i18n/messageformat2_allocation.h
@@ -1,6 +1,8 @@
 // © 2024 and later: Unicode, Inc. and others.
 // License & terms of use: http://www.unicode.org/copyright.html
 
+#include "unicode/utypes.h"
+
 #ifndef U_HIDE_DEPRECATED_API
 
 #ifndef MESSAGEFORMAT2_UTILS_H
@@ -10,6 +12,8 @@
 
 #if !UCONFIG_NO_FORMATTING
 
+#if !UCONFIG_NO_MF2
+
 #include "unicode/unistr.h"
 #include "uvector.h"
 
@@ -129,6 +133,8 @@ namespace message2 {
 
 U_NAMESPACE_END
 
+#endif /* #if !UCONFIG_NO_MF2 */
+
 #endif /* #if !UCONFIG_NO_FORMATTING */
 
 #endif /* U_SHOW_CPLUSPLUS_API */

diff --git a/icu4c/source/i18n/messageformat2_arguments.cpp b/icu4c/source/i18n/messageformat2_arguments.cpp
@@ -5,6 +5,8 @@
 
 #if !UCONFIG_NO_FORMATTING
 
+#if !UCONFIG_NO_MF2
+
 #include "unicode/messageformat2_arguments.h"
 #include "unicode/messageformat2_data_model_names.h"
 #include "uvector.h" // U_ASSERT
@@ -52,4 +54,6 @@ namespace message2 {
 
 U_NAMESPACE_END
 
+#endif /* #if !UCONFIG_NO_MF2 */
+
 #endif /* #if !UCONFIG_NO_FORMATTING */
diff --git a/icu4c/source/i18n/messageformat2_cached_formatters.h b/icu4c/source/i18n/messageformat2_cached_formatters.h
@@ -1,6 +1,8 @@
 // © 2024 and later: Unicode, Inc. and others.
 // License & terms of use: http://www.unicode.org/copyright.html
 
+#include "unicode/utypes.h"
+
 #ifndef U_HIDE_DEPRECATED_API
 
 #ifndef MESSAGEFORMAT2_CACHED_FORMATTERS_H
@@ -10,6 +12,8 @@
 
 #if !UCONFIG_NO_FORMATTING
 
+#if !UCONFIG_NO_MF2
+
 #include "unicode/messageformat2_data_model_names.h"
 #include "unicode/messageformat2_function_registry.h"
 #include "hash.h"
@@ -52,6 +56,8 @@ namespace message2 {
 
 U_NAMESPACE_END
 
+#endif /* #if !UCONFIG_NO_MF2 */
+
 #endif /* #if !UCONFIG_NO_FORMATTING */
 
 #endif /* U_SHOW_CPLUSPLUS_API */

diff --git a/icu4c/source/i18n/messageformat2_checker.cpp b/icu4c/source/i18n/messageformat2_checker.cpp
@@ -5,6 +5,8 @@
 
 #if !UCONFIG_NO_FORMATTING
 
+#if !UCONFIG_NO_MF2
+
 #include "messageformat2_allocation.h"
 #include "messageformat2_checker.h"
 #include "messageformat2_macros.h"
@@ -292,4 +294,6 @@ void Checker::check(UErrorCode& status) {
 } // namespace message2
 U_NAMESPACE_END
 
+#endif /* #if !UCONFIG_NO_MF2 */
+
 #endif /* #if !UCONFIG_NO_FORMATTING */
diff --git a/icu4c/source/i18n/messageformat2_checker.h b/icu4c/source/i18n/messageformat2_checker.h
@@ -1,6 +1,8 @@
 // © 2024 and later: Unicode, Inc. and others.
 // License & terms of use: http://www.unicode.org/copyright.html
 
+#include "unicode/utypes.h"
+
 #ifndef U_HIDE_DEPRECATED_API
 
 #ifndef MESSAGEFORMAT_CHECKER_H
@@ -10,6 +12,8 @@
 
 #if !UCONFIG_NO_FORMATTING
 
+#if !UCONFIG_NO_MF2
+
 #include "unicode/messageformat2_data_model.h"
 #include "messageformat2_errors.h"
 
@@ -80,6 +84,8 @@ namespace message2 {
 
 U_NAMESPACE_END
 
+#endif /* #if !UCONFIG_NO_MF2 */
+
 #endif /* #if !UCONFIG_NO_FORMATTING */
 
 #endif /* U_SHOW_CPLUSPLUS_API */

diff --git a/icu4c/source/i18n/messageformat2_data_model.cpp b/icu4c/source/i18n/messageformat2_data_model.cpp
@@ -5,6 +5,8 @@
 
 #if !UCONFIG_NO_FORMATTING
 
+#if !UCONFIG_NO_MF2
+
 #include "unicode/messageformat2_data_model.h"
 #include "messageformat2_allocation.h"
 #include "messageformat2_macros.h"
@@ -1095,4 +1097,6 @@ MFDataModel::Builder::~Builder() {
 
 U_NAMESPACE_END
 
+#endif /* #if !UCONFIG_NO_MF2 */
+
 #endif /* #if !UCONFIG_NO_FORMATTING */
diff --git a/icu4c/source/i18n/messageformat2_errors.cpp b/icu4c/source/i18n/messageformat2_errors.cpp
@@ -5,6 +5,8 @@
 
 #if !UCONFIG_NO_FORMATTING
 
+#if !UCONFIG_NO_MF2
+
 #include "messageformat2_allocation.h"
 #include "messageformat2_errors.h"
 #include "messageformat2_macros.h"
@@ -283,4 +285,6 @@ namespace message2 {
 
 U_NAMESPACE_END
 
+#endif /* #if !UCONFIG_NO_MF2 */
+
 #endif /* #if !UCONFIG_NO_FORMATTING */
diff --git a/icu4c/source/i18n/messageformat2_errors.h b/icu4c/source/i18n/messageformat2_errors.h
@@ -1,6 +1,8 @@
 // © 2024 and later: Unicode, Inc. and others.
 // License & terms of use: http://www.unicode.org/copyright.html
 
+#include "unicode/utypes.h"
+
 #ifndef U_HIDE_DEPRECATED_API
 
 #ifndef MESSAGEFORMAT2_ERRORS_H
@@ -15,8 +17,9 @@
 
 #if !UCONFIG_NO_FORMATTING
 
+#if !UCONFIG_NO_MF2
+
 #include "unicode/messageformat2_data_model_names.h"
-#include "unicode/utypes.h"
 #include "unicode/unistr.h"
 
 #include "uvector.h"
@@ -145,6 +148,8 @@ namespace message2 {
 
 U_NAMESPACE_END
 
+#endif /* #if !UCONFIG_NO_MF2 */
+
 #endif /* #if !UCONFIG_NO_FORMATTING */
 
 #endif /* U_SHOW_CPLUSPLUS_API */

diff --git a/icu4c/source/i18n/messageformat2_evaluation.cpp b/icu4c/source/i18n/messageformat2_evaluation.cpp
@@ -5,6 +5,8 @@
 
 #if !UCONFIG_NO_FORMATTING
 
+#if !UCONFIG_NO_MF2
+
 #include "messageformat2_allocation.h"
 #include "messageformat2_cached_formatters.h"
 #include "messageformat2_evaluation.h"
@@ -205,4 +207,6 @@ PrioritizedVariant::~PrioritizedVariant() {}
 } // namespace message2
 U_NAMESPACE_END
 
+#endif /* #if !UCONFIG_NO_MF2 */
+
 #endif /* #if !UCONFIG_NO_FORMATTING */
diff --git a/icu4c/source/i18n/messageformat2_evaluation.h b/icu4c/source/i18n/messageformat2_evaluation.h
@@ -1,6 +1,8 @@
 // © 2024 and later: Unicode, Inc. and others.
 // License & terms of use: http://www.unicode.org/copyright.html
 
+#include "unicode/utypes.h"
+
 #ifndef U_HIDE_DEPRECATED_API
 
 #ifndef MESSAGEFORMAT2_EVALUATION_H
@@ -15,6 +17,8 @@
 
 #if !UCONFIG_NO_FORMATTING
 
+#if !UCONFIG_NO_MF2
+
 #include "unicode/messageformat2_arguments.h"
 #include "unicode/messageformat2_data_model.h"
 #include "unicode/messageformat2_function_registry.h"
@@ -193,6 +197,8 @@ namespace message2 {
 
 U_NAMESPACE_END
 
+#endif /* #if !UCONFIG_NO_MF2 */
+
 #endif /* #if !UCONFIG_NO_FORMATTING */
 
 #endif /* U_SHOW_CPLUSPLUS_API */

diff --git a/icu4c/source/i18n/messageformat2_formattable.cpp b/icu4c/source/i18n/messageformat2_formattable.cpp
@@ -5,6 +5,8 @@
 
 #if !UCONFIG_NO_FORMATTING
 
+#if !UCONFIG_NO_MF2
+
 #include "unicode/messageformat2_formattable.h"
 #include "unicode/smpdtfmt.h"
 #include "messageformat2_macros.h"
@@ -331,4 +333,6 @@ namespace message2 {
 
 U_NAMESPACE_END
 
+#endif /* #if !UCONFIG_NO_MF2 */
+
 #endif /* #if !UCONFIG_NO_FORMATTING */
diff --git a/icu4c/source/i18n/messageformat2_formatter.cpp b/icu4c/source/i18n/messageformat2_formatter.cpp
@@ -5,6 +5,8 @@
 
 #if !UCONFIG_NO_FORMATTING
 
+#if !UCONFIG_NO_MF2
+
 #include "unicode/messageformat2.h"
 #include "messageformat2_allocation.h"
 #include "messageformat2_cached_formatters.h"
@@ -350,4 +352,6 @@ namespace message2 {
 
 U_NAMESPACE_END
 
+#endif /* #if !UCONFIG_NO_MF2 */
+
 #endif /* #if !UCONFIG_NO_FORMATTING */
diff --git a/icu4c/source/i18n/messageformat2_function_registry.cpp b/icu4c/source/i18n/messageformat2_function_registry.cpp
@@ -5,6 +5,8 @@
 
 #if !UCONFIG_NO_FORMATTING
 
+#if !UCONFIG_NO_MF2
+
 #include "unicode/dtptngen.h"
 #include "unicode/messageformat2_data_model_names.h"
 #include "unicode/messageformat2_function_registry.h"
@@ -1178,5 +1180,7 @@ StandardFunctions::TextSelector::~TextSelector() {}
 } // namespace message2
 U_NAMESPACE_END
 
+#endif /* #if !UCONFIG_NO_MF2 */
+
 #endif /* #if !UCONFIG_NO_FORMATTING */
 
diff --git a/icu4c/source/i18n/messageformat2_function_registry_internal.h b/icu4c/source/i18n/messageformat2_function_registry_internal.h
@@ -1,6 +1,8 @@
 // © 2024 and later: Unicode, Inc. and others.
 // License & terms of use: http://www.unicode.org/copyright.html
 
+#include "unicode/utypes.h"
+
 #ifndef U_HIDE_DEPRECATED_API
 
 #ifndef MESSAGEFORMAT2_FUNCTION_REGISTRY_INTERNAL_H
@@ -10,6 +12,8 @@
 
 #if !UCONFIG_NO_FORMATTING
 
+#if !UCONFIG_NO_MF2
+
 #include "unicode/datefmt.h"
 #include "unicode/messageformat2_function_registry.h"
 
@@ -217,6 +221,8 @@ namespace message2 {
 
 U_NAMESPACE_END
 
+#endif /* #if !UCONFIG_NO_MF2 */
+
 #endif /* #if !UCONFIG_NO_FORMATTING */
 
 #endif /* U_SHOW_CPLUSPLUS_API */