mirror of
https://github.com/unicode-org/icu.git
synced 2025-04-10 07:39:16 +00:00
ICU-22001 Put translation unit local definitions in unnamed namespaces.
Any symbol that isn't intended to have external linkage should either be declared static (legacy code) or put in an unnamed namespace.
This commit is contained in:
Fredrik Roubert
Fredrik Roubert
parent
faac745421
commit
edfe255de3
4 changed files with 51 additions and 18 deletions
|
|
@ -21,16 +21,18 @@
|
|||
#include "unicode/unum.h"
|
||||
#include "cmemory.h"
|
||||
|
||||
namespace {
|
||||
|
||||
typedef struct ExpectedResult {
|
||||
double value;
|
||||
// Invariant characters, will be converted to UTF-16 and then unescaped.
|
||||
const char *expected;
|
||||
} ExpectedResult;
|
||||
|
||||
static const char *kShortStr = "Short";
|
||||
static const char *kLongStr = "Long";
|
||||
const char* kShortStr = "Short";
|
||||
const char* kLongStr = "Long";
|
||||
|
||||
static ExpectedResult kEnglishShort[] = {
|
||||
ExpectedResult kEnglishShort[] = {
|
||||
{0.0, "0"},
|
||||
{0.17, "0.17"},
|
||||
{1.0, "1"},
|
||||
|
|
@ -48,7 +50,7 @@ static ExpectedResult kEnglishShort[] = {
|
|||
{1.23456789E14, "120T"},
|
||||
{1.23456789E15, "1200T"}};
|
||||
|
||||
static ExpectedResult kSerbianShort[] = {
|
||||
ExpectedResult kSerbianShort[] = {
|
||||
{1234.0, "1,2\\u00a0\\u0445\\u0438\\u0459."},
|
||||
{12345.0, "12\\u00a0\\u0445\\u0438\\u0459."},
|
||||
{20789.0, "21\\u00a0\\u0445\\u0438\\u0459."},
|
||||
|
|
@ -64,7 +66,7 @@ static ExpectedResult kSerbianShort[] = {
|
|||
{1.23456789E14, "120\\u00A0\\u0431\\u0438\\u043B."},
|
||||
{1.23456789E15, "1200\\u00A0\\u0431\\u0438\\u043B."}};
|
||||
|
||||
static ExpectedResult kSerbianLong[] = {
|
||||
ExpectedResult kSerbianLong[] = {
|
||||
{1234.0, "1,2 \\u0445\\u0438\\u0459\\u0430\\u0434\\u0435"}, // 10^3 few
|
||||
{12345.0, "12 \\u0445\\u0438\\u0459\\u0430\\u0434\\u0430"}, // 10^3 other
|
||||
{21789.0, "22 \\u0445\\u0438\\u0459\\u0430\\u0434\\u0435"}, // 10^3 few
|
||||
|
|
@ -83,7 +85,7 @@ static ExpectedResult kSerbianLong[] = {
|
|||
{1.23456789E14, "120 \\u0431\\u0438\\u043B\\u0438\\u043E\\u043D\\u0430"}, // 10^12 other
|
||||
{1.23456789E15, "1200 \\u0431\\u0438\\u043B\\u0438\\u043E\\u043D\\u0430"}}; // 10^12 other
|
||||
|
||||
static ExpectedResult kSerbianLongNegative[] = {
|
||||
ExpectedResult kSerbianLongNegative[] = {
|
||||
{-1234.0, "-1,2 \\u0445\\u0438\\u0459\\u0430\\u0434\\u0435"},
|
||||
{-12345.0, "-12 \\u0445\\u0438\\u0459\\u0430\\u0434\\u0430"},
|
||||
{-21789.0, "-22 \\u0445\\u0438\\u0459\\u0430\\u0434\\u0435"},
|
||||
|
|
@ -102,7 +104,7 @@ static ExpectedResult kSerbianLongNegative[] = {
|
|||
{-1.23456789E14, "-120 \\u0431\\u0438\\u043B\\u0438\\u043E\\u043D\\u0430"},
|
||||
{-1.23456789E15, "-1200 \\u0431\\u0438\\u043B\\u0438\\u043E\\u043D\\u0430"}};
|
||||
|
||||
static ExpectedResult kJapaneseShort[] = {
|
||||
ExpectedResult kJapaneseShort[] = {
|
||||
{1234.0, "1200"},
|
||||
{12345.0, "1.2\\u4E07"},
|
||||
{123456.0, "12\\u4E07"},
|
||||
|
|
@ -121,7 +123,7 @@ static ExpectedResult kJapaneseShort[] = {
|
|||
{1.23456789E18, "120\\u4EAC"},
|
||||
{1.23456789E19, "1200\\u4EAC"}};
|
||||
|
||||
static ExpectedResult kSwahiliShort[] = {
|
||||
ExpectedResult kSwahiliShort[] = {
|
||||
{1234.0, "elfu\\u00a01.2"},
|
||||
{12345.0, "elfu\\u00a012"},
|
||||
{123456.0, "elfu\\u00a0120"},
|
||||
|
|
@ -135,7 +137,7 @@ static ExpectedResult kSwahiliShort[] = {
|
|||
{1.23456789E13, "12T"},
|
||||
{1.23456789E15, "1200T"}};
|
||||
|
||||
static ExpectedResult kCsShort[] = {
|
||||
ExpectedResult kCsShort[] = {
|
||||
{1000.0, "1\\u00a0tis."},
|
||||
{1500.0, "1,5\\u00a0tis."},
|
||||
{5000.0, "5\\u00a0tis."},
|
||||
|
|
@ -151,12 +153,12 @@ static ExpectedResult kCsShort[] = {
|
|||
{1.27123456E13, "13\\u00a0bil."},
|
||||
{1.27123456E14, "130\\u00a0bil."}};
|
||||
|
||||
static ExpectedResult kSkLong[] = {
|
||||
ExpectedResult kSkLong[] = {
|
||||
{1000.0, "1 tis\\u00edc"},
|
||||
{1572.0, "1,6 tis\\u00edca"},
|
||||
{5184.0, "5,2 tis\\u00edca"}};
|
||||
|
||||
static ExpectedResult kSwahiliShortNegative[] = {
|
||||
ExpectedResult kSwahiliShortNegative[] = {
|
||||
{-1234.0, "elfu\\u00a0-1.2"},
|
||||
{-12345.0, "elfu\\u00a0-12"},
|
||||
{-123456.0, "elfu\\u00a0-120"},
|
||||
|
|
@ -170,10 +172,10 @@ static ExpectedResult kSwahiliShortNegative[] = {
|
|||
{-1.23456789E13, "-12T"},
|
||||
{-1.23456789E15, "-1200T"}};
|
||||
|
||||
static ExpectedResult kArabicLong[] = {
|
||||
ExpectedResult kArabicLong[] = {
|
||||
{-5300.0, "\\u061C-\\u0665\\u066B\\u0663 \\u0623\\u0644\\u0641"}};
|
||||
|
||||
static ExpectedResult kChineseCurrencyTestData[] = {
|
||||
ExpectedResult kChineseCurrencyTestData[] = {
|
||||
{1.0, "\\u00A51"},
|
||||
{12.0, "\\u00A512"},
|
||||
{123.0, "\\u00A5120"},
|
||||
|
|
@ -190,7 +192,8 @@ static ExpectedResult kChineseCurrencyTestData[] = {
|
|||
{12345678901234.0, "\\u00A512\\u4E07\\u4EBF"},
|
||||
{123456789012345.0, "\\u00A5120\\u4E07\\u4EBF"},
|
||||
};
|
||||
static ExpectedResult kGermanCurrencyTestData[] = {
|
||||
|
||||
ExpectedResult kGermanCurrencyTestData[] = {
|
||||
{1.0, "1\\u00A0\\u20AC"},
|
||||
{12.0, "12\\u00A0\\u20AC"},
|
||||
{123.0, "120\\u00A0\\u20AC"},
|
||||
|
|
@ -207,7 +210,8 @@ static ExpectedResult kGermanCurrencyTestData[] = {
|
|||
{12345678901234.0, "12\\u00A0Bio.\\u00A0\\u20AC"},
|
||||
{123456789012345.0, "120\\u00A0Bio.\\u00A0\\u20AC"},
|
||||
};
|
||||
static ExpectedResult kEnglishCurrencyTestData[] = {
|
||||
|
||||
ExpectedResult kEnglishCurrencyTestData[] = {
|
||||
{1.0, "$1"},
|
||||
{12.0, "$12"},
|
||||
{123.0, "$120"},
|
||||
|
|
@ -225,6 +229,7 @@ static ExpectedResult kEnglishCurrencyTestData[] = {
|
|||
{123456789012345.0, "$120T"},
|
||||
};
|
||||
|
||||
} // namespace
|
||||
|
||||
class CompactDecimalFormatTest : public IntlTest {
|
||||
public:
|
||||
|
|
|
|||
|
|
@ -32,12 +32,16 @@
|
|||
#include "unicode/reldatefmt.h"
|
||||
#include "unicode/rbnf.h"
|
||||
|
||||
namespace {
|
||||
|
||||
struct ExpectedResult {
|
||||
const Measure *measures;
|
||||
int32_t count;
|
||||
const char *expected;
|
||||
};
|
||||
|
||||
} // namespace
|
||||
|
||||
class MeasureFormatTest : public IntlTest {
|
||||
public:
|
||||
MeasureFormatTest() {
|
||||
|
|
|
|||
|
|
@ -1669,7 +1669,9 @@ UnicodeStringTest::TestBogus() {
|
|||
// most of StringEnumeration is tested elsewhere
|
||||
// this test improves code coverage
|
||||
|
||||
static const char *const
|
||||
namespace {
|
||||
|
||||
const char* const
|
||||
testEnumStrings[]={
|
||||
"a",
|
||||
"b",
|
||||
|
|
@ -1678,6 +1680,8 @@ testEnumStrings[]={
|
|||
"eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee"
|
||||
};
|
||||
|
||||
} // namespace
|
||||
|
||||
class TestEnumeration : public StringEnumeration {
|
||||
public:
|
||||
TestEnumeration() : i(0) {}
|
||||
|
|
@ -1873,6 +1877,8 @@ UnicodeStringTest::TestUTF32() {
|
|||
}
|
||||
}
|
||||
|
||||
namespace {
|
||||
|
||||
class TestCheckedArrayByteSink : public CheckedArrayByteSink {
|
||||
public:
|
||||
TestCheckedArrayByteSink(char* outbuf, int32_t capacity)
|
||||
|
|
@ -1881,6 +1887,8 @@ public:
|
|||
UBool calledFlush;
|
||||
};
|
||||
|
||||
} // namespace
|
||||
|
||||
void
|
||||
UnicodeStringTest::TestUTF8() {
|
||||
static const uint8_t utf8[] = {
|
||||
|
|
@ -2148,11 +2156,15 @@ UnicodeStringTest::TestSizeofUnicodeString() {
|
|||
}
|
||||
}
|
||||
|
||||
namespace {
|
||||
|
||||
// Try to avoid clang -Wself-move warnings from s1 = std::move(s1);
|
||||
void moveFrom(UnicodeString &dest, UnicodeString &src) {
|
||||
dest = std::move(src);
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
||||
void
|
||||
UnicodeStringTest::TestMoveSwap() {
|
||||
static const char16_t abc[3] = { 0x61, 0x62, 0x63 }; // "abc"
|
||||
|
|
|
|||
|
|
@ -94,6 +94,8 @@ void UTS46Test::runIndexedTest(int32_t index, UBool exec, const char *&name, cha
|
|||
TESTCASE_AUTO_END;
|
||||
}
|
||||
|
||||
namespace {
|
||||
|
||||
const uint32_t severeErrors=
|
||||
UIDNA_ERROR_LEADING_COMBINING_MARK|
|
||||
UIDNA_ERROR_DISALLOWED|
|
||||
|
|
@ -101,7 +103,7 @@ const uint32_t severeErrors=
|
|||
UIDNA_ERROR_LABEL_HAS_DOT|
|
||||
UIDNA_ERROR_INVALID_ACE_LABEL;
|
||||
|
||||
static UBool isASCII(const UnicodeString &str) {
|
||||
UBool isASCII(const UnicodeString &str) {
|
||||
const char16_t *s=str.getBuffer();
|
||||
int32_t length=str.length();
|
||||
for(int32_t i=0; i<length; ++i) {
|
||||
|
|
@ -125,6 +127,8 @@ public:
|
|||
UBool calledFlush;
|
||||
};
|
||||
|
||||
} // namespace
|
||||
|
||||
void UTS46Test::TestAPI() {
|
||||
UErrorCode errorCode=U_ZERO_ERROR;
|
||||
UnicodeString result;
|
||||
|
|
@ -352,6 +356,8 @@ void UTS46Test::TestTooLong() {
|
|||
assertEquals("decode: expected an error for too-long input", U_INPUT_TOO_LONG_ERROR, errorCode);
|
||||
}
|
||||
|
||||
namespace {
|
||||
|
||||
struct TestCase {
|
||||
// Input string and options string (Nontransitional/Transitional/Both).
|
||||
const char *s, *o;
|
||||
|
|
@ -360,7 +366,7 @@ struct TestCase {
|
|||
uint32_t errors;
|
||||
};
|
||||
|
||||
static const TestCase testCases[]={
|
||||
const TestCase testCases[] = {
|
||||
{ "www.eXample.cOm", "B", // all ASCII
|
||||
"www.example.com", 0 },
|
||||
{ "B\\u00FCcher.de", "B", // u-umlaut
|
||||
|
|
@ -699,6 +705,8 @@ static const TestCase testCases[]={
|
|||
// "", 0 },
|
||||
};
|
||||
|
||||
} // namespace
|
||||
|
||||
void UTS46Test::TestSomeCases() {
|
||||
IcuTestErrorCode errorCode(*this, "TestSomeCases");
|
||||
char buffer[400], buffer2[400];
|
||||
|
|
@ -1118,9 +1126,13 @@ void UTS46Test::idnaTestOneLine(char *fields[][2], UErrorCode &errorCode) {
|
|||
toAsciiTStatus.c_str(), aTInfo);
|
||||
}
|
||||
|
||||
namespace {
|
||||
|
||||
// TODO: de-duplicate
|
||||
U_DEFINE_LOCAL_OPEN_POINTER(LocalStdioFilePointer, FILE, fclose);
|
||||
|
||||
} // namespace
|
||||
|
||||
// http://www.unicode.org/Public/idna/latest/IdnaTest.txt
|
||||
void UTS46Test::IdnaTest() {
|
||||
IcuTestErrorCode errorCode(*this, "IdnaTest");
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue