Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ICU-22097 Use string_view constants for option names and formatter names #3418

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

ICU-22097 Use string_view constants for option names and formatter names #3418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion icu4c/source/i18n/messageformat2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -690,7 +690,7 @@ UnicodeString MessageFormatter::formatToString(const MessageArguments& arguments
formatPattern(context, *globalEnv, dataModel.getPattern(), status, result);
} else {
// Check for errors/warnings -- if so, then the result of pattern selection is the fallback value
// See https://github.com/unicode-org/message-format-wg/blob/main/spec/formatting.md#pattern-selection
// See https://www.unicode.org/reports/tr35/tr35-messageFormat.html#pattern-selection
const DynamicErrors& err = context.getErrors();
if (err.hasSyntaxError() || err.hasDataModelError()) {
result += REPLACEMENT;
Expand Down
4 changes: 2 additions & 2 deletions icu4c/source/i18n/messageformat2_evaluation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ FunctionOptions::FunctionOptions(UVector&& optionsVector, UErrorCode& status) {
options = moveVectorToArray<ResolvedFunctionOption>(optionsVector, status);
}

UBool FunctionOptions::getFunctionOption(const UnicodeString& key, Formattable& option) const {
UBool FunctionOptions::getFunctionOption(const std::u16string_view key, Formattable& option) const {
if (options == nullptr) {
U_ASSERT(functionOptionsLen == 0);
}
Expand All @@ -60,7 +60,7 @@ UBool FunctionOptions::getFunctionOption(const UnicodeString& key, Formattable&
return false;
}

UnicodeString FunctionOptions::getStringFunctionOption(const UnicodeString& key) const {
UnicodeString FunctionOptions::getStringFunctionOption(const std::u16string_view key) const {
Formattable option;
if (getFunctionOption(key, option)) {
if (option.getType() == UFMT_STRING) {
Expand Down
36 changes: 24 additions & 12 deletions icu4c/source/i18n/messageformat2_formatter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,18 @@ U_NAMESPACE_BEGIN

namespace message2 {

namespace functions {
static constexpr std::u16string_view DATETIME = u"datetime";
static constexpr std::u16string_view DATE = u"date";
static constexpr std::u16string_view TIME = u"time";
static constexpr std::u16string_view NUMBER = u"number";
static constexpr std::u16string_view INTEGER = u"integer";
static constexpr std::u16string_view TEST_FUNCTION = u"test:function";
static constexpr std::u16string_view TEST_FORMAT = u"test:format";
static constexpr std::u16string_view TEST_SELECT = u"test:select";
static constexpr std::u16string_view STRING = u"string";
}

// MessageFormatter::Builder

// -------------------------------------
Expand Down Expand Up @@ -130,18 +142,18 @@ namespace message2 {
FormatterFactory* time = StandardFunctions::DateTimeFactory::time(success);
FormatterFactory* number = new StandardFunctions::NumberFactory();
FormatterFactory* integer = new StandardFunctions::IntegerFactory();
standardFunctionsBuilder.adoptFormatter(FunctionName(UnicodeString("datetime")), dateTime, success)
.adoptFormatter(FunctionName(UnicodeString("date")), date, success)
.adoptFormatter(FunctionName(UnicodeString("time")), time, success)
.adoptFormatter(FunctionName(UnicodeString("number")), number, success)
.adoptFormatter(FunctionName(UnicodeString("integer")), integer, success)
.adoptFormatter(FunctionName(UnicodeString("test:function")), new StandardFunctions::TestFormatFactory(), success)
.adoptFormatter(FunctionName(UnicodeString("test:format")), new StandardFunctions::TestFormatFactory(), success)
.adoptSelector(FunctionName(UnicodeString("number")), new StandardFunctions::PluralFactory(UPLURAL_TYPE_CARDINAL), success)
.adoptSelector(FunctionName(UnicodeString("integer")), new StandardFunctions::PluralFactory(StandardFunctions::PluralFactory::integer()), success)
.adoptSelector(FunctionName(UnicodeString("string")), new StandardFunctions::TextFactory(), success)
.adoptSelector(FunctionName(UnicodeString("test:function")), new StandardFunctions::TestSelectFactory(), success)
.adoptSelector(FunctionName(UnicodeString("test:select")), new StandardFunctions::TestSelectFactory(), success);
standardFunctionsBuilder.adoptFormatter(FunctionName(functions::DATETIME), dateTime, success)
.adoptFormatter(FunctionName(functions::DATE), date, success)
.adoptFormatter(FunctionName(functions::TIME), time, success)
.adoptFormatter(FunctionName(functions::NUMBER), number, success)
.adoptFormatter(FunctionName(functions::INTEGER), integer, success)
.adoptFormatter(FunctionName(functions::TEST_FUNCTION), new StandardFunctions::TestFormatFactory(), success)
.adoptFormatter(FunctionName(functions::TEST_FORMAT), new StandardFunctions::TestFormatFactory(), success)
.adoptSelector(FunctionName(functions::NUMBER), new StandardFunctions::PluralFactory(UPLURAL_TYPE_CARDINAL), success)
.adoptSelector(FunctionName(functions::INTEGER), new StandardFunctions::PluralFactory(StandardFunctions::PluralFactory::integer()), success)
.adoptSelector(FunctionName(functions::STRING), new StandardFunctions::TextFactory(), success)
.adoptSelector(FunctionName(functions::TEST_FUNCTION), new StandardFunctions::TestSelectFactory(), success)
.adoptSelector(FunctionName(functions::TEST_SELECT), new StandardFunctions::TestSelectFactory(), success);
CHECK_ERROR(success);
standardMFFunctionRegistry = standardFunctionsBuilder.build();
CHECK_ERROR(success);
Expand Down
Loading