Cleanup

Author: catamorphism

icu4c/source/i18n/messageformat2.cpp

@@ -165,8 +165,11 @@ static UnicodeString reserialize(const UnicodeString& s) {
             } else {
                 U_ASSERT(result.isEvaluated());
 
-                // Need to create a new InternalValue such that the inner
-                // FunctionValue does _not_ return true for wasSetFromLiteral()
+                // The FunctionValue representing the right-hand side of this declaration
+                // might have a wasSetFromLiteral() method that returns true (i.e. if it's a BaseValue);
+                // But that value is being assigned to a variable here, so we need to
+                // ensure that wasSetFromLiteral() returns false.
+                // We accomplish this by wrapping it in a VariableValue.
                 const FunctionValue* inner = result.getValue(status);
                 U_ASSERT(U_SUCCESS(status)); // Already checked that result is evaluated
                 LocalPointer<FunctionValue> variableValue(static_cast<FunctionValue*>(VariableValue::create(inner, status)));
@@ -303,13 +306,13 @@ static UnicodeString reserialize(const UnicodeString& s) {
 // Function options and context
 // ----------------------------
 static UMFBidiOption getBidiOption(const UnicodeString& s) {
-    if (s == u"ltr") {
+    if (s == options::LTR) {
         return U_MF_BIDI_OPTION_LTR;
     }
-    if (s == u"rtl") {
+    if (s == options::RTL) {
         return U_MF_BIDI_OPTION_RTL;
     }
-    if (s == u"auto") {
+    if (s == options::AUTO) {
         return U_MF_BIDI_OPTION_AUTO;
     }
     return U_MF_BIDI_OPTION_INHERIT; // inherit is default
@@ -541,17 +544,19 @@ void MessageFormatter::formatPattern(MessageContext& context,
                   result += partVal.asFallback();
                   result += RIGHT_CURLY_BRACE;
               } else {
-                  // Do final formatting (e.g. formatting numbers as strings)
+                  // Get the `FunctionValue` corresponding to this part
                   const FunctionValue* val = partVal.getValue(status);
-                  // Shouldn't be null or a fallback
+                  // It shouldn't be null or a fallback
                   U_ASSERT(U_SUCCESS(status));
 
                   // See comment in matchSelectorKeys()
                   bool badSelectOption = !checkSelectOption(*val);
+
+                  // Format the `FunctionValue` to a string
                   UnicodeString fmt = val->formatToString(status);
 
+                  // Apply bidi isolation to the formatted result
                   UMFDirectionality dir = val->getDirection();
-
                   result += bidiIsolate(val->getDirectionAnnotation(), dir, fmt);
 
                   if (badSelectOption) {
@@ -675,12 +680,6 @@ void MessageFormatter::matchSelectorKeys(const UVector& keys,
     const FunctionValue* rvVal = rv.getValue(status);
 
     // This condition can't be checked in the selector.
-    // Effectively, there are two different kinds of "bad option" errors:
-    // one that can be recovered from (used for select=$var) and one that
-    // can't (used for bad digit size options and other cases).
-    // The checking of the recoverable error has to be done here; otherwise,
-    // the "bad option" signaled by the selector implementation would cause
-    // fallback output to be used when formatting the `*` pattern.
     bool badSelectOption = !checkSelectOption(*rvVal);
 
     U_ASSERT(U_SUCCESS(status));

icu4c/source/i18n/messageformat2_evaluation.h

@@ -166,7 +166,6 @@ namespace message2 {
             UnicodeString formatToString(UErrorCode& status) const override { return underlyingValue->formatToString(status); }
             const Formattable& unwrap() const override { return underlyingValue->unwrap(); }
             const FunctionOptions& getResolvedOptions() const override { return underlyingValue->getResolvedOptions(); }
-            const Locale& getLocale() const override { return underlyingValue->getLocale(); }
             UMFDirectionality getDirection() const override { return underlyingValue->getDirection(); }
             UMFBidiOption getDirectionAnnotation() const override { return underlyingValue->getDirectionAnnotation(); }
             UBool isSelectable() const override { return underlyingValue->isSelectable(); }

icu4c/source/i18n/messageformat2_function_registry.cpp

@@ -258,10 +258,8 @@ MFFunctionRegistry::~MFFunctionRegistry() {
 
 // Specific function implementations
 
-// Strings and numbers have different behaviors here.
-// See https://github.com/unicode-org/message-format-wg/issues/970
 UMFDirectionality
-numberOutputDirectionalityFromUDir(UMFBidiOption uDir, const Locale& locale) {
+outputDirectionalityFromUDir(UMFBidiOption uDir, const Locale& locale) {
     switch (uDir) {
     case U_MF_BIDI_OPTION_LTR:
         return U_MF_DIRECTIONALITY_LTR;
@@ -741,7 +739,7 @@ StandardFunctions::NumberValue::NumberValue(const Number& parent,
     innerValue = arg.unwrap();
     functionName = UnicodeString(parent.isInteger ? "integer" : "number");
     inputDir = context.getDirection();
-    dir = numberOutputDirectionalityFromUDir(inputDir, locale);
+    dir = outputDirectionalityFromUDir(inputDir, locale);
 
     number::LocalizedNumberFormatter realFormatter;
     realFormatter = formatterForOptions(parent, locale, opts, errorCode);
@@ -1079,7 +1077,7 @@ StandardFunctions::DateTimeValue::DateTimeValue(DateTime::DateTimeType type,
         break;
     }
     inputDir = context.getDirection();
-    dir = numberOutputDirectionalityFromUDir(inputDir, locale);
+    dir = outputDirectionalityFromUDir(inputDir, locale);
 
     const Formattable* source = &innerValue;
 
@@ -1466,6 +1464,7 @@ UnicodeString StandardFunctions::StringValue::formatToString(UErrorCode& errorCo
     return formattedString;
 }
 
+/*
 // Strings and numbers have different behaviors here.
 // See https://github.com/unicode-org/message-format-wg/issues/970
 UMFDirectionality stringOutputDirectionFromInput(UMFBidiOption inputDir) {
@@ -1481,6 +1480,7 @@ UMFDirectionality stringOutputDirectionFromInput(UMFBidiOption inputDir) {
 
     return U_MF_DIRECTIONALITY_LTR;
 }
+*/
 
 StandardFunctions::StringValue::StringValue(const FunctionContext& context,
                                             const FunctionValue& val,
@@ -1491,7 +1491,7 @@ StandardFunctions::StringValue::StringValue(const FunctionContext& context,
     innerValue = val.unwrap();
     functionName = UnicodeString("string");
     inputDir = context.getDirection();
-    dir = stringOutputDirectionFromInput(inputDir);
+    dir = outputDirectionalityFromUDir(inputDir, locale);
     // No options
     // Convert to string
     formattedString = formattableToString(context.getLocale(), innerValue, status);

icu4c/source/i18n/unicode/messageformat2_function_registry.h

@@ -441,16 +441,6 @@ namespace message2 {
              * @deprecated This API is for technology preview only.
              */
             virtual const FunctionOptions& getResolvedOptions() const { return opts; }
-            /**
-             * Returns the locale that this value was annotated with (or the default
-             * locale for the formatter if there was no locale annotation.)
-             *
-             * @return The locale for this value.
-             *
-             * @internal ICU 78 technology preview
-             * @deprecated This API is for technology preview only.
-             */
-            virtual const Locale& getLocale() const { return locale; }
             /**
              * Returns the directionality of this value, i.e. the directionality
              * that its formatted result should have.