Skip to content

Commit 84dfb1d

Browse files
roubertroubert
committed
ICU-23054 Replace const static with static const.
1 parent 0388269 commit 84dfb1d

File tree

9 files changed

+84
-84
lines changed

9 files changed

+84
-84
lines changed

‎icu4c/source/test/cintltst/cdetst.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
#include "string.h"
3737

3838
static UCollator *myCollation;
39-
const static UChar testSourceCases[][MAX_TOKEN_LEN] =
39+
static const UChar testSourceCases[][MAX_TOKEN_LEN] =
4040
{
4141
{0x0047/*'G'*/, 0x0072/*'r'*/, 0x00F6, 0x00DF, 0x0065/*'e'*/, 0x0000},
4242
{0x0061/*'a'*/, 0x0062/*'b'*/, 0x0063/*'c'*/, 0x0000},
@@ -52,7 +52,7 @@ const static UChar testSourceCases[][MAX_TOKEN_LEN] =
5252
{0x0053/*'S'*/, 0x0074/*'t'*/, 0x0072/*'r'*/, 0x0061/*'a'*/, 0x00DF, 0x0065/*'e'*/, 0x0000}
5353
};
5454

55-
const static UChar testTargetCases[][MAX_TOKEN_LEN] =
55+
static const UChar testTargetCases[][MAX_TOKEN_LEN] =
5656
{
5757
{0x0047/*'G'*/, 0x0072/*'r'*/, 0x006f/*'o'*/, 0x0073/*'s'*/, 0x0073/*'s'*/, 0x0069/*'i'*/, 0x0073/*'s'*/, 0x0074/*'t'*/, 0x0000},
5858
{0x0061/*'a'*/, 0x0308, 0x0062/*'b'*/, 0x0063/*'c'*/, 0x0000},
@@ -68,7 +68,7 @@ const static UChar testTargetCases[][MAX_TOKEN_LEN] =
6868
{0x0053/*'S'*/, 0x0074/*'t'*/, 0x0072/*'r'*/, 0x0061/*'a'*/, 0x0073/*'s'*/, 0x0073/*'s'*/, 0x0065/*'e'*/, 0x0000}
6969
};
7070

71-
const static UCollationResult results[][2] =
71+
static const UCollationResult results[][2] =
7272
{
7373
/* Primary*/ /* Tertiary*/
7474
{ UCOL_LESS, UCOL_LESS }, /*should be UCOL_GREATER for primary*/

‎icu4c/source/test/cintltst/cestst.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
#include "string.h"
3737

3838
static UCollator *myCollation;
39-
const static UChar testSourceCases[][MAX_TOKEN_LEN] = {
39+
static const UChar testSourceCases[][MAX_TOKEN_LEN] = {
4040
{0x0062/*'a'*/, 0x006c/*'l'*/, 0x0069/*'i'*/, 0x0061/*'a'*/, 0x0073/*'s'*/, 0x0000},
4141
{0x0045/*'E'*/, 0x006c/*'l'*/, 0x006c/*'l'*/, 0x0069/*'i'*/, 0x006f/*'o'*/, 0x0074/*'t'*/, 0x0000},
4242
{0x0048/*'H'*/, 0x0065/*'e'*/, 0x006c/*'l'*/, 0x006c/*'l'*/, 0x006f/*'o'*/, 0x0000},
@@ -48,7 +48,7 @@ const static UChar testSourceCases[][MAX_TOKEN_LEN] = {
4848
{0x0048/*'H'*/, 0x0065/*'e'*/, 0x006c/*'l'*/, 0x006c/*'l'*/, 0x006f/*'o'*/, 0x0000},
4949
};
5050

51-
const static UChar testTargetCases[][MAX_TOKEN_LEN] = {
51+
static const UChar testTargetCases[][MAX_TOKEN_LEN] = {
5252
{0x0062/*'a'*/, 0x006c/*'l'*/, 0x006c/*'l'*/, 0x0069/*'i'*/, 0x0061/*'a'*/, 0x0073/*'s'*/, 0x0000},
5353
{0x0045/*'E'*/, 0x006d/*'m'*/, 0x0069/*'i'*/, 0x006f/*'o'*/, 0x0074/*'t'*/, 0x0000},
5454
{0x0068/*'h'*/, 0x0065/*'e'*/, 0x006c/*'l'*/, 0x006c/*'l'*/, 0x006f/*'O'*/, 0x0000},
@@ -60,7 +60,7 @@ const static UChar testTargetCases[][MAX_TOKEN_LEN] = {
6060
{0x0068/*'h'*/, 0x0065/*'e'*/, 0x006c/*'l'*/, 0x006c/*'l'*/, 0x006f/*'O'*/, 0x0000},
6161
};
6262

63-
const static UCollationResult results[] = {
63+
static const UCollationResult results[] = {
6464
UCOL_LESS,
6565
UCOL_LESS,
6666
UCOL_GREATER,

‎icu4c/source/test/cintltst/cfintst.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,23 +36,23 @@
3636
#include "string.h"
3737

3838
static UCollator *myCollation;
39-
const static UChar testSourceCases[][MAX_TOKEN_LEN] = {
39+
static const UChar testSourceCases[][MAX_TOKEN_LEN] = {
4040
{0x0077/*'w'*/, 0x0061/*'a'*/, 0x0074/*'t'*/, 0x0000},
4141
{0x0076/*'v'*/, 0x0061/*'a'*/, 0x0074/*'t'*/, 0x0000},
4242
{0x0061/*'a'*/, 0x00FC, 0x0062/*'b'*/, 0x0065/*'e'*/, 0x0063/*'c'*/, 0x006b/*'k'*/, 0x0000},
4343
{0x004c/*'L'*/, 0x00E5, 0x0076/*'v'*/, 0x0069/*'i'*/, 0x0000},
4444
{0x0077/*'w'*/, 0x0061/*'a'*/, 0x0074/*'t'*/, 0x0000}
4545
};
4646

47-
const static UChar testTargetCases[][MAX_TOKEN_LEN] = {
47+
static const UChar testTargetCases[][MAX_TOKEN_LEN] = {
4848
{0x0076/*'v'*/, 0x0061/*'a'*/, 0x0074/*'t'*/, 0x0000},
4949
{0x0077/*'w'*/, 0x0061/*'a'*/, 0x0079/*'y'*/, 0x0000},
5050
{0x0061/*'a'*/, 0x0078/*'x'*/, 0x0062/*'b'*/, 0x0065/*'e'*/, 0x0063/*'c'*/, 0x006b/*'k'*/, 0x0000},
5151
{0x004c/*'L'*/, 0x00E4, 0x0077/*'w'*/, 0x0065/*'e'*/, 0x0000},
5252
{0x0076/*'v'*/, 0x0061/*'a'*/, 0x0074/*'t'*/, 0x0000}
5353
};
5454

55-
const static UCollationResult results[] = {
55+
static const UCollationResult results[] = {
5656
UCOL_GREATER,
5757
UCOL_LESS,
5858
UCOL_GREATER,

‎icu4c/source/test/cintltst/cfrtst.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
#include "string.h"
3838

3939
static UCollator *myCollation;
40-
const static UChar testSourceCases[][MAX_TOKEN_LEN] =
40+
static const UChar testSourceCases[][MAX_TOKEN_LEN] =
4141
{
4242
{0x0061/*'a'*/, 0x0062/*'b'*/, 0x0063/*'c'*/, 0x0000},
4343
{0x0043/*'C'*/, 0x004f/*'O'*/, 0x0054/*'T'*/, 0x0045/*'E'*/, 0x0000},
@@ -53,7 +53,7 @@ const static UChar testSourceCases[][MAX_TOKEN_LEN] =
5353
{0x0101, 0x0000}
5454
};
5555

56-
const static UChar testTargetCases[][MAX_TOKEN_LEN] =
56+
static const UChar testTargetCases[][MAX_TOKEN_LEN] =
5757
{
5858
{0x0041/*'A'*/, 0x0042/*'B'*/, 0x0043/*'C'*/, 0x0000},
5959
{0x0063/*'c'*/, 0x00f4, 0x0074/*'t'*/, 0x0065/*'e'*/, 0x0000},
@@ -69,7 +69,7 @@ const static UChar testTargetCases[][MAX_TOKEN_LEN] =
6969
{0x01df, 0x0000}
7070
};
7171

72-
const static UCollationResult results[] =
72+
static const UCollationResult results[] =
7373
{
7474
UCOL_LESS,
7575
UCOL_LESS,
@@ -87,7 +87,7 @@ const static UCollationResult results[] =
8787

8888
/* 0x0300 is grave, 0x0301 is acute*/
8989
/* the order of elements in this array must be different than the order in CollationEnglishTest*/
90-
const static UChar testAcute[][MAX_TOKEN_LEN] =
90+
static const UChar testAcute[][MAX_TOKEN_LEN] =
9191
{
9292
/*00*/ {0x0065/*'e'*/, 0x0065/*'e'*/, 0x0000},
9393
/*01*/ {0x0065/*'e'*/, 0x0301, 0x0065/*'e'*/, 0x0000},
@@ -116,7 +116,7 @@ const static UChar testAcute[][MAX_TOKEN_LEN] =
116116
/*18*/ {0x0065/*'e'*/, 0x0301, 0x0300, 0x0065/*'e'*/, 0x0301, 0x0300, 0x0000}
117117
};
118118

119-
const static UChar testBugs[][MAX_TOKEN_LEN] =
119+
static const UChar testBugs[][MAX_TOKEN_LEN] =
120120
{
121121
{0x0061/*'a'*/, 0x000},
122122
{0x0041/*'A'*/, 0x000},

‎icu4c/source/test/cintltst/cg7coll.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ const char* locales[8] = {
6565

6666

6767

68-
const static UChar testCases[][MAX_TOKEN_LEN] = {
68+
static const UChar testCases[][MAX_TOKEN_LEN] = {
6969
{ 0x0062 /*'b'*/, 0x006c /*'l'*/, 0x0061 /*'a'*/, 0x0062 /*'c'*/, 0x006b /*'k'*/,
7070
0x0062 /*'b'*/, 0x0069 /*'i'*/, 0x0072 /*'r'*/, 0x0064 /*'d'*/, 0x0073 /*'s'*/, 0x0000}, /* 9 */
7171
{ 0x0050 /*'P'*/, 0x0061 /*'a'*/, 0x0074/*'t'*/, 0x0000}, /* 1 */
@@ -105,7 +105,7 @@ const static UChar testCases[][MAX_TOKEN_LEN] = {
105105
{ 0x007a /*'z'*/, 0x0065 /*'e'*/, 0x0062 /*'b'*/, 0x0072 /*'r'*/, 0x0061 /*'a'*/, 0x0000} /* 29 */
106106
};
107107

108-
const static int32_t results[TESTLOCALES][TOTALTESTSET] = {
108+
static const int32_t results[TESTLOCALES][TOTALTESTSET] = {
109109
{ 12, 13, 9, 0, 14, 1, 11, 2, 3, 4, 5, 6, 8, 10, 7, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31 }, /* en_US */
110110
{ 12, 13, 9, 0, 14, 1, 11, 2, 3, 4, 5, 6, 8, 10, 7, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31 }, /* en_GB */
111111
{ 12, 13, 9, 0, 14, 1, 11, 2, 3, 4, 5, 6, 8, 10, 7, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31 }, /* en_CA */

‎icu4c/source/test/cintltst/cjaptst.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
#include "string.h"
4040

4141
static UCollator *myCollation;
42-
const static UChar testSourceCases[][MAX_TOKEN_LEN] = {
42+
static const UChar testSourceCases[][MAX_TOKEN_LEN] = {
4343
{0xff9E, 0x0000},
4444
{0x3042, 0x0000},
4545
{0x30A2, 0x0000},
@@ -48,7 +48,7 @@ const static UChar testSourceCases[][MAX_TOKEN_LEN] = {
4848
{0x30A2, 0x30FC, 0x30C8, 0x0000} /* 6 */
4949
};
5050

51-
const static UChar testTargetCases[][MAX_TOKEN_LEN] = {
51+
static const UChar testTargetCases[][MAX_TOKEN_LEN] = {
5252
{0xFF9F, 0x0000},
5353
{0x30A2, 0x0000},
5454
{0x3042, 0x3042, 0x0000},
@@ -57,7 +57,7 @@ const static UChar testTargetCases[][MAX_TOKEN_LEN] = {
5757
{0x3042, 0x3042, 0x3068, 0x0000} /* 6 */
5858
};
5959

60-
const static UCollationResult results[] = {
60+
static const UCollationResult results[] = {
6161
UCOL_LESS,
6262
UCOL_EQUAL, /*UCOL_LESS*/ /* Katakanas and Hiraganas are equal on tertiary level(ICU 2.0)*/
6363
UCOL_LESS,
@@ -66,35 +66,35 @@ const static UCollationResult results[] = {
6666
UCOL_LESS, /*UCOL_GREATER*/ /* Prolonged sound mark sorts BEFORE equivalent vowel (ICU 2.0)*//* 6 */
6767
};
6868

69-
const static UChar testBaseCases[][MAX_TOKEN_LEN] = {
69+
static const UChar testBaseCases[][MAX_TOKEN_LEN] = {
7070
{0x30AB, 0x0000},
7171
{0x30AB, 0x30AD, 0x0000},
7272
{0x30AD, 0x0000},
7373
{0x30AD, 0x30AD, 0x0000}
7474
};
7575

76-
const static UChar testPlainDakutenHandakutenCases[][MAX_TOKEN_LEN] = {
76+
static const UChar testPlainDakutenHandakutenCases[][MAX_TOKEN_LEN] = {
7777
{0x30CF, 0x30AB, 0x0000},
7878
{0x30D0, 0x30AB, 0x0000},
7979
{0x30CF, 0x30AD, 0x0000},
8080
{0x30D0, 0x30AD, 0x0000}
8181
};
8282

83-
const static UChar testSmallLargeCases[][MAX_TOKEN_LEN] = {
83+
static const UChar testSmallLargeCases[][MAX_TOKEN_LEN] = {
8484
{0x30C3, 0x30CF, 0x0000},
8585
{0x30C4, 0x30CF, 0x0000},
8686
{0x30C3, 0x30D0, 0x0000},
8787
{0x30C4, 0x30D0, 0x0000}
8888
};
8989

90-
const static UChar testKatakanaHiraganaCases[][MAX_TOKEN_LEN] = {
90+
static const UChar testKatakanaHiraganaCases[][MAX_TOKEN_LEN] = {
9191
{0x3042, 0x30C3, 0x0000},
9292
{0x30A2, 0x30C3, 0x0000},
9393
{0x3042, 0x30C4, 0x0000},
9494
{0x30A2, 0x30C4, 0x0000}
9595
};
9696

97-
const static UChar testChooonKigooCases[][MAX_TOKEN_LEN] = {
97+
static const UChar testChooonKigooCases[][MAX_TOKEN_LEN] = {
9898
/*0*/ {0x30AB, 0x30FC, 0x3042, 0x0000},
9999
/*1*/ {0x30AB, 0x30FC, 0x30A2, 0x0000},
100100
/*2*/ {0x30AB, 0x30A4, 0x3042, 0x0000},

0 commit comments

Comments
 (0)