mirror of
https://github.com/openjdk/jdk.git
synced 2025-08-27 23:04:50 +02:00
8251317: Support for CLDR version 38
Reviewed-by: erikj, bchristi, joehw
This commit is contained in:
parent
c816464c1d
commit
68138893a5
209 changed files with 52398 additions and 15372 deletions
|
@ -1212,7 +1212,7 @@ public final class CompactNumberFormat extends NumberFormat {
|
|||
}
|
||||
|
||||
// Patterns for plurals syntax validation
|
||||
private final static String EXPR = "([niftvw])\\s*(([/%])\\s*(\\d+))*";
|
||||
private final static String EXPR = "([niftvwe])\\s*(([/%])\\s*(\\d+))*";
|
||||
private final static String RELATION = "(!?=)";
|
||||
private final static String VALUE_RANGE = "((\\d+)\\.\\.(\\d+)|\\d+)";
|
||||
private final static String CONDITION = EXPR + "\\s*" +
|
||||
|
@ -2422,7 +2422,7 @@ public final class CompactNumberFormat extends NumberFormat {
|
|||
.allMatch(r -> relationCheck(r, input)));
|
||||
}
|
||||
|
||||
private final static String NAMED_EXPR = "(?<op>[niftvw])\\s*((?<div>[/%])\\s*(?<val>\\d+))*";
|
||||
private final static String NAMED_EXPR = "(?<op>[niftvwe])\\s*((?<div>[/%])\\s*(?<val>\\d+))*";
|
||||
private final static String NAMED_RELATION = "(?<rel>!?=)";
|
||||
private final static String NAMED_VALUE_RANGE = "(?<start>\\d+)\\.\\.(?<end>\\d+)|(?<value>\\d+)";
|
||||
private final static Pattern EXPR_PATTERN = Pattern.compile(NAMED_EXPR);
|
||||
|
@ -2495,7 +2495,7 @@ public final class CompactNumberFormat extends NumberFormat {
|
|||
double ret = 0;
|
||||
|
||||
if (input == Double.POSITIVE_INFINITY) {
|
||||
ret =input;
|
||||
ret = input;
|
||||
} else {
|
||||
String op = expr.group("op");
|
||||
if (Objects.equals(op, "n") || Objects.equals(op, "i")) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue