author | mgronlun |
Sun, 22 Sep 2019 17:31:57 +0200 (2019-09-22) | |
branch | JEP-349-branch |
changeset 58259 | b6efcf2217f1 |
parent 58028 | 7ac4273bb49b |
permissions | -rw-r--r-- |
9535
d930011fd275
7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard
sherman
parents:
diff
changeset
|
1 |
/* |
55013 | 2 |
* Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved. |
9535
d930011fd275
7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard
sherman
parents:
diff
changeset
|
3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
d930011fd275
7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard
sherman
parents:
diff
changeset
|
4 |
* |
d930011fd275
7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard
sherman
parents:
diff
changeset
|
5 |
* This code is free software; you can redistribute it and/or modify it |
d930011fd275
7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard
sherman
parents:
diff
changeset
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
d930011fd275
7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard
sherman
parents:
diff
changeset
|
7 |
* published by the Free Software Foundation. |
d930011fd275
7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard
sherman
parents:
diff
changeset
|
8 |
* |
d930011fd275
7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard
sherman
parents:
diff
changeset
|
9 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
d930011fd275
7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard
sherman
parents:
diff
changeset
|
10 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
d930011fd275
7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard
sherman
parents:
diff
changeset
|
11 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
d930011fd275
7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard
sherman
parents:
diff
changeset
|
12 |
* version 2 for more details (a copy is included in the LICENSE file that |
d930011fd275
7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard
sherman
parents:
diff
changeset
|
13 |
* accompanied this code). |
d930011fd275
7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard
sherman
parents:
diff
changeset
|
14 |
* |
d930011fd275
7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard
sherman
parents:
diff
changeset
|
15 |
* You should have received a copy of the GNU General Public License version |
d930011fd275
7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard
sherman
parents:
diff
changeset
|
16 |
* 2 along with this work; if not, write to the Free Software Foundation, |
d930011fd275
7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard
sherman
parents:
diff
changeset
|
17 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
d930011fd275
7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard
sherman
parents:
diff
changeset
|
18 |
* |
d930011fd275
7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard
sherman
parents:
diff
changeset
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
d930011fd275
7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard
sherman
parents:
diff
changeset
|
20 |
* or visit www.oracle.com if you need additional information or have any |
d930011fd275
7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard
sherman
parents:
diff
changeset
|
21 |
* questions. |
d930011fd275
7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard
sherman
parents:
diff
changeset
|
22 |
*/ |
d930011fd275
7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard
sherman
parents:
diff
changeset
|
23 |
|
d930011fd275
7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard
sherman
parents:
diff
changeset
|
24 |
|
d930011fd275
7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard
sherman
parents:
diff
changeset
|
25 |
/** |
d930011fd275
7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard
sherman
parents:
diff
changeset
|
26 |
* @test |
58028
7ac4273bb49b
8229831: Upgrade Character.isUnicodeIdentifierStart/Part() methods to the latest standard
naoto
parents:
55013
diff
changeset
|
27 |
* @bug 7037261 7070436 7198195 8032446 8072600 8221431 8229831 |
7ac4273bb49b
8229831: Upgrade Character.isUnicodeIdentifierStart/Part() methods to the latest standard
naoto
parents:
55013
diff
changeset
|
28 |
* @summary Check j.l.Character.isLowerCase/isUppercase/isAlphabetic/isIdeographic/ |
7ac4273bb49b
8229831: Upgrade Character.isUnicodeIdentifierStart/Part() methods to the latest standard
naoto
parents:
55013
diff
changeset
|
29 |
* isUnicodeIdentifierStart/isUnicodeIdentifierPart |
55013 | 30 |
* @library /lib/testlibrary/java/lang |
9535
d930011fd275
7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard
sherman
parents:
diff
changeset
|
31 |
*/ |
d930011fd275
7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard
sherman
parents:
diff
changeset
|
32 |
|
d930011fd275
7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard
sherman
parents:
diff
changeset
|
33 |
import java.util.regex.*; |
d930011fd275
7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard
sherman
parents:
diff
changeset
|
34 |
import java.util.*; |
d930011fd275
7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard
sherman
parents:
diff
changeset
|
35 |
import java.io.*; |
d930011fd275
7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard
sherman
parents:
diff
changeset
|
36 |
import static java.lang.Character.*; |
d930011fd275
7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard
sherman
parents:
diff
changeset
|
37 |
|
d930011fd275
7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard
sherman
parents:
diff
changeset
|
38 |
public class CheckProp { |
d930011fd275
7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard
sherman
parents:
diff
changeset
|
39 |
|
58028
7ac4273bb49b
8229831: Upgrade Character.isUnicodeIdentifierStart/Part() methods to the latest standard
naoto
parents:
55013
diff
changeset
|
40 |
public static void main(String[] args) { |
7ac4273bb49b
8229831: Upgrade Character.isUnicodeIdentifierStart/Part() methods to the latest standard
naoto
parents:
55013
diff
changeset
|
41 |
Map<String, List<Integer>> propMap = new LinkedHashMap<>(); |
7ac4273bb49b
8229831: Upgrade Character.isUnicodeIdentifierStart/Part() methods to the latest standard
naoto
parents:
55013
diff
changeset
|
42 |
List.of(UCDFiles.PROP_LIST.toFile(), UCDFiles.DERIVED_PROPS.toFile()).stream() |
7ac4273bb49b
8229831: Upgrade Character.isUnicodeIdentifierStart/Part() methods to the latest standard
naoto
parents:
55013
diff
changeset
|
43 |
.forEach(f -> readPropMap(propMap, f)); |
9535
d930011fd275
7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard
sherman
parents:
diff
changeset
|
44 |
|
d930011fd275
7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard
sherman
parents:
diff
changeset
|
45 |
Integer[] otherLowercase = propMap.get("Other_Lowercase").toArray(new Integer[0]); |
d930011fd275
7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard
sherman
parents:
diff
changeset
|
46 |
Integer[] otherUppercase = propMap.get("Other_Uppercase").toArray(new Integer[0]); |
d930011fd275
7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard
sherman
parents:
diff
changeset
|
47 |
Integer[] otherAlphabetic = propMap.get("Other_Alphabetic").toArray(new Integer[0]); |
d930011fd275
7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard
sherman
parents:
diff
changeset
|
48 |
Integer[] ideographic = propMap.get("Ideographic").toArray(new Integer[0]); |
58028
7ac4273bb49b
8229831: Upgrade Character.isUnicodeIdentifierStart/Part() methods to the latest standard
naoto
parents:
55013
diff
changeset
|
49 |
Integer[] IDStart = propMap.get("ID_Start").toArray(new Integer[0]); |
7ac4273bb49b
8229831: Upgrade Character.isUnicodeIdentifierStart/Part() methods to the latest standard
naoto
parents:
55013
diff
changeset
|
50 |
Integer[] IDContinue = propMap.get("ID_Continue").toArray(new Integer[0]); |
9535
d930011fd275
7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard
sherman
parents:
diff
changeset
|
51 |
|
d930011fd275
7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard
sherman
parents:
diff
changeset
|
52 |
int fails = 0; |
d930011fd275
7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard
sherman
parents:
diff
changeset
|
53 |
for (int cp = MIN_CODE_POINT; cp < MAX_CODE_POINT; cp++) { |
d930011fd275
7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard
sherman
parents:
diff
changeset
|
54 |
int type = getType(cp); |
d930011fd275
7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard
sherman
parents:
diff
changeset
|
55 |
if (isLowerCase(cp) != |
d930011fd275
7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard
sherman
parents:
diff
changeset
|
56 |
(type == LOWERCASE_LETTER || |
d930011fd275
7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard
sherman
parents:
diff
changeset
|
57 |
Arrays.binarySearch(otherLowercase, cp) >= 0)) |
d930011fd275
7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard
sherman
parents:
diff
changeset
|
58 |
{ |
d930011fd275
7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard
sherman
parents:
diff
changeset
|
59 |
fails++; |
d930011fd275
7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard
sherman
parents:
diff
changeset
|
60 |
System.err.printf("Wrong isLowerCase(U+%04x)\n", cp); |
d930011fd275
7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard
sherman
parents:
diff
changeset
|
61 |
} |
d930011fd275
7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard
sherman
parents:
diff
changeset
|
62 |
if (isUpperCase(cp) != |
d930011fd275
7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard
sherman
parents:
diff
changeset
|
63 |
(type == UPPERCASE_LETTER || |
d930011fd275
7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard
sherman
parents:
diff
changeset
|
64 |
Arrays.binarySearch(otherUppercase, cp) >= 0)) |
d930011fd275
7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard
sherman
parents:
diff
changeset
|
65 |
{ |
d930011fd275
7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard
sherman
parents:
diff
changeset
|
66 |
fails++; |
d930011fd275
7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard
sherman
parents:
diff
changeset
|
67 |
System.err.printf("Wrong isUpperCase(U+%04x)\n", cp); |
d930011fd275
7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard
sherman
parents:
diff
changeset
|
68 |
} |
d930011fd275
7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard
sherman
parents:
diff
changeset
|
69 |
if (isAlphabetic(cp) != |
d930011fd275
7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard
sherman
parents:
diff
changeset
|
70 |
(type == UPPERCASE_LETTER || type == LOWERCASE_LETTER || |
d930011fd275
7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard
sherman
parents:
diff
changeset
|
71 |
type == TITLECASE_LETTER || type == MODIFIER_LETTER || |
d930011fd275
7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard
sherman
parents:
diff
changeset
|
72 |
type == OTHER_LETTER || type == OTHER_LETTER || |
d930011fd275
7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard
sherman
parents:
diff
changeset
|
73 |
type == LETTER_NUMBER || |
d930011fd275
7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard
sherman
parents:
diff
changeset
|
74 |
Arrays.binarySearch(otherAlphabetic, cp) >=0)) |
d930011fd275
7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard
sherman
parents:
diff
changeset
|
75 |
{ |
d930011fd275
7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard
sherman
parents:
diff
changeset
|
76 |
fails++; |
d930011fd275
7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard
sherman
parents:
diff
changeset
|
77 |
System.err.printf("Wrong isAlphabetic(U+%04x)\n", cp); |
d930011fd275
7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard
sherman
parents:
diff
changeset
|
78 |
} |
d930011fd275
7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard
sherman
parents:
diff
changeset
|
79 |
if (isIdeographic(cp) != |
d930011fd275
7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard
sherman
parents:
diff
changeset
|
80 |
(Arrays.binarySearch(ideographic, cp) >= 0)) |
d930011fd275
7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard
sherman
parents:
diff
changeset
|
81 |
{ |
d930011fd275
7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard
sherman
parents:
diff
changeset
|
82 |
fails++; |
d930011fd275
7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard
sherman
parents:
diff
changeset
|
83 |
System.err.printf("Wrong isIdeographic(U+%04x)\n", cp); |
d930011fd275
7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard
sherman
parents:
diff
changeset
|
84 |
} |
58028
7ac4273bb49b
8229831: Upgrade Character.isUnicodeIdentifierStart/Part() methods to the latest standard
naoto
parents:
55013
diff
changeset
|
85 |
if (isUnicodeIdentifierStart(cp) != |
7ac4273bb49b
8229831: Upgrade Character.isUnicodeIdentifierStart/Part() methods to the latest standard
naoto
parents:
55013
diff
changeset
|
86 |
(cp == 0x2E2F || |
7ac4273bb49b
8229831: Upgrade Character.isUnicodeIdentifierStart/Part() methods to the latest standard
naoto
parents:
55013
diff
changeset
|
87 |
Arrays.binarySearch(IDStart, cp) >= 0)) |
7ac4273bb49b
8229831: Upgrade Character.isUnicodeIdentifierStart/Part() methods to the latest standard
naoto
parents:
55013
diff
changeset
|
88 |
{ |
7ac4273bb49b
8229831: Upgrade Character.isUnicodeIdentifierStart/Part() methods to the latest standard
naoto
parents:
55013
diff
changeset
|
89 |
fails++; |
7ac4273bb49b
8229831: Upgrade Character.isUnicodeIdentifierStart/Part() methods to the latest standard
naoto
parents:
55013
diff
changeset
|
90 |
System.err.printf("Wrong isUnicodeIdentifierStart(U+%04x)\n", cp); |
7ac4273bb49b
8229831: Upgrade Character.isUnicodeIdentifierStart/Part() methods to the latest standard
naoto
parents:
55013
diff
changeset
|
91 |
} |
7ac4273bb49b
8229831: Upgrade Character.isUnicodeIdentifierStart/Part() methods to the latest standard
naoto
parents:
55013
diff
changeset
|
92 |
if (isUnicodeIdentifierPart(cp) != |
7ac4273bb49b
8229831: Upgrade Character.isUnicodeIdentifierStart/Part() methods to the latest standard
naoto
parents:
55013
diff
changeset
|
93 |
(isIdentifierIgnorable(cp) || |
7ac4273bb49b
8229831: Upgrade Character.isUnicodeIdentifierStart/Part() methods to the latest standard
naoto
parents:
55013
diff
changeset
|
94 |
cp == 0x2E2F || |
7ac4273bb49b
8229831: Upgrade Character.isUnicodeIdentifierStart/Part() methods to the latest standard
naoto
parents:
55013
diff
changeset
|
95 |
Arrays.binarySearch(IDContinue, cp) >= 0)) |
7ac4273bb49b
8229831: Upgrade Character.isUnicodeIdentifierStart/Part() methods to the latest standard
naoto
parents:
55013
diff
changeset
|
96 |
{ |
7ac4273bb49b
8229831: Upgrade Character.isUnicodeIdentifierStart/Part() methods to the latest standard
naoto
parents:
55013
diff
changeset
|
97 |
fails++; |
7ac4273bb49b
8229831: Upgrade Character.isUnicodeIdentifierStart/Part() methods to the latest standard
naoto
parents:
55013
diff
changeset
|
98 |
System.err.printf("Wrong isUnicodeIdentifierPart(U+%04x)\n", cp); |
7ac4273bb49b
8229831: Upgrade Character.isUnicodeIdentifierStart/Part() methods to the latest standard
naoto
parents:
55013
diff
changeset
|
99 |
} |
9535
d930011fd275
7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard
sherman
parents:
diff
changeset
|
100 |
} |
d930011fd275
7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard
sherman
parents:
diff
changeset
|
101 |
if (fails != 0) |
d930011fd275
7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard
sherman
parents:
diff
changeset
|
102 |
throw new RuntimeException("CheckProp failed=" + fails); |
d930011fd275
7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard
sherman
parents:
diff
changeset
|
103 |
} |
58028
7ac4273bb49b
8229831: Upgrade Character.isUnicodeIdentifierStart/Part() methods to the latest standard
naoto
parents:
55013
diff
changeset
|
104 |
|
7ac4273bb49b
8229831: Upgrade Character.isUnicodeIdentifierStart/Part() methods to the latest standard
naoto
parents:
55013
diff
changeset
|
105 |
private static void readPropMap(Map<String, List<Integer>> propMap, File fPropList) { |
7ac4273bb49b
8229831: Upgrade Character.isUnicodeIdentifierStart/Part() methods to the latest standard
naoto
parents:
55013
diff
changeset
|
106 |
try { |
7ac4273bb49b
8229831: Upgrade Character.isUnicodeIdentifierStart/Part() methods to the latest standard
naoto
parents:
55013
diff
changeset
|
107 |
BufferedReader sbfr = new BufferedReader(new FileReader(fPropList)); |
7ac4273bb49b
8229831: Upgrade Character.isUnicodeIdentifierStart/Part() methods to the latest standard
naoto
parents:
55013
diff
changeset
|
108 |
Matcher m = Pattern.compile("(\\p{XDigit}+)(?:\\.{2}(\\p{XDigit}+))?\\s*;\\s+(\\w+)\\s+#.*").matcher(""); |
7ac4273bb49b
8229831: Upgrade Character.isUnicodeIdentifierStart/Part() methods to the latest standard
naoto
parents:
55013
diff
changeset
|
109 |
|
7ac4273bb49b
8229831: Upgrade Character.isUnicodeIdentifierStart/Part() methods to the latest standard
naoto
parents:
55013
diff
changeset
|
110 |
String line = null; |
7ac4273bb49b
8229831: Upgrade Character.isUnicodeIdentifierStart/Part() methods to the latest standard
naoto
parents:
55013
diff
changeset
|
111 |
int lineNo = 0; |
7ac4273bb49b
8229831: Upgrade Character.isUnicodeIdentifierStart/Part() methods to the latest standard
naoto
parents:
55013
diff
changeset
|
112 |
while ((line = sbfr.readLine()) != null) { |
7ac4273bb49b
8229831: Upgrade Character.isUnicodeIdentifierStart/Part() methods to the latest standard
naoto
parents:
55013
diff
changeset
|
113 |
lineNo++; |
7ac4273bb49b
8229831: Upgrade Character.isUnicodeIdentifierStart/Part() methods to the latest standard
naoto
parents:
55013
diff
changeset
|
114 |
if (line.length() <= 1 || line.charAt(0) == '#') { |
7ac4273bb49b
8229831: Upgrade Character.isUnicodeIdentifierStart/Part() methods to the latest standard
naoto
parents:
55013
diff
changeset
|
115 |
continue; |
7ac4273bb49b
8229831: Upgrade Character.isUnicodeIdentifierStart/Part() methods to the latest standard
naoto
parents:
55013
diff
changeset
|
116 |
} |
7ac4273bb49b
8229831: Upgrade Character.isUnicodeIdentifierStart/Part() methods to the latest standard
naoto
parents:
55013
diff
changeset
|
117 |
m.reset(line); |
7ac4273bb49b
8229831: Upgrade Character.isUnicodeIdentifierStart/Part() methods to the latest standard
naoto
parents:
55013
diff
changeset
|
118 |
if (m.matches()) { |
7ac4273bb49b
8229831: Upgrade Character.isUnicodeIdentifierStart/Part() methods to the latest standard
naoto
parents:
55013
diff
changeset
|
119 |
int start = Integer.parseInt(m.group(1), 16); |
7ac4273bb49b
8229831: Upgrade Character.isUnicodeIdentifierStart/Part() methods to the latest standard
naoto
parents:
55013
diff
changeset
|
120 |
int end = (m.group(2)==null)?start |
7ac4273bb49b
8229831: Upgrade Character.isUnicodeIdentifierStart/Part() methods to the latest standard
naoto
parents:
55013
diff
changeset
|
121 |
:Integer.parseInt(m.group(2), 16); |
7ac4273bb49b
8229831: Upgrade Character.isUnicodeIdentifierStart/Part() methods to the latest standard
naoto
parents:
55013
diff
changeset
|
122 |
String name = m.group(3); |
7ac4273bb49b
8229831: Upgrade Character.isUnicodeIdentifierStart/Part() methods to the latest standard
naoto
parents:
55013
diff
changeset
|
123 |
|
7ac4273bb49b
8229831: Upgrade Character.isUnicodeIdentifierStart/Part() methods to the latest standard
naoto
parents:
55013
diff
changeset
|
124 |
List<Integer> list = propMap.get(name); |
7ac4273bb49b
8229831: Upgrade Character.isUnicodeIdentifierStart/Part() methods to the latest standard
naoto
parents:
55013
diff
changeset
|
125 |
if (list == null) { |
7ac4273bb49b
8229831: Upgrade Character.isUnicodeIdentifierStart/Part() methods to the latest standard
naoto
parents:
55013
diff
changeset
|
126 |
list = new ArrayList<Integer>(); |
7ac4273bb49b
8229831: Upgrade Character.isUnicodeIdentifierStart/Part() methods to the latest standard
naoto
parents:
55013
diff
changeset
|
127 |
propMap.put(name, list); |
7ac4273bb49b
8229831: Upgrade Character.isUnicodeIdentifierStart/Part() methods to the latest standard
naoto
parents:
55013
diff
changeset
|
128 |
} |
7ac4273bb49b
8229831: Upgrade Character.isUnicodeIdentifierStart/Part() methods to the latest standard
naoto
parents:
55013
diff
changeset
|
129 |
while (start <= end) |
7ac4273bb49b
8229831: Upgrade Character.isUnicodeIdentifierStart/Part() methods to the latest standard
naoto
parents:
55013
diff
changeset
|
130 |
list.add(start++); |
7ac4273bb49b
8229831: Upgrade Character.isUnicodeIdentifierStart/Part() methods to the latest standard
naoto
parents:
55013
diff
changeset
|
131 |
} else { |
7ac4273bb49b
8229831: Upgrade Character.isUnicodeIdentifierStart/Part() methods to the latest standard
naoto
parents:
55013
diff
changeset
|
132 |
System.out.printf("Warning: Unrecognized line %d <%s>%n", lineNo, line); |
7ac4273bb49b
8229831: Upgrade Character.isUnicodeIdentifierStart/Part() methods to the latest standard
naoto
parents:
55013
diff
changeset
|
133 |
} |
7ac4273bb49b
8229831: Upgrade Character.isUnicodeIdentifierStart/Part() methods to the latest standard
naoto
parents:
55013
diff
changeset
|
134 |
} |
7ac4273bb49b
8229831: Upgrade Character.isUnicodeIdentifierStart/Part() methods to the latest standard
naoto
parents:
55013
diff
changeset
|
135 |
sbfr.close(); |
7ac4273bb49b
8229831: Upgrade Character.isUnicodeIdentifierStart/Part() methods to the latest standard
naoto
parents:
55013
diff
changeset
|
136 |
} catch (IOException ioe) { |
7ac4273bb49b
8229831: Upgrade Character.isUnicodeIdentifierStart/Part() methods to the latest standard
naoto
parents:
55013
diff
changeset
|
137 |
throw new UncheckedIOException(ioe); |
7ac4273bb49b
8229831: Upgrade Character.isUnicodeIdentifierStart/Part() methods to the latest standard
naoto
parents:
55013
diff
changeset
|
138 |
} |
7ac4273bb49b
8229831: Upgrade Character.isUnicodeIdentifierStart/Part() methods to the latest standard
naoto
parents:
55013
diff
changeset
|
139 |
|
7ac4273bb49b
8229831: Upgrade Character.isUnicodeIdentifierStart/Part() methods to the latest standard
naoto
parents:
55013
diff
changeset
|
140 |
//for (String name: propMap.keySet()) { |
7ac4273bb49b
8229831: Upgrade Character.isUnicodeIdentifierStart/Part() methods to the latest standard
naoto
parents:
55013
diff
changeset
|
141 |
// System.out.printf("%s %d%n", name, propMap.get(name).size()); |
7ac4273bb49b
8229831: Upgrade Character.isUnicodeIdentifierStart/Part() methods to the latest standard
naoto
parents:
55013
diff
changeset
|
142 |
//} |
7ac4273bb49b
8229831: Upgrade Character.isUnicodeIdentifierStart/Part() methods to the latest standard
naoto
parents:
55013
diff
changeset
|
143 |
} |
9535
d930011fd275
7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard
sherman
parents:
diff
changeset
|
144 |
} |