8268124: Update java.lang to use switch expressions

Reviewed-by: naoto, darcy, mchung, iris, lancea, dfuchs
This commit is contained in:
Patrick Concannon 2021-06-10 11:12:37 +00:00
parent a187fcc3ec
commit d43c8a74b3
22 changed files with 421 additions and 551 deletions

View file

@ -72,23 +72,15 @@ abstract class CharacterData {
if (ch >>> 8 == 0) { // fast-path
return CharacterDataLatin1.instance;
} else {
switch(ch >>> 16) { //plane 00-16
case(0):
return CharacterData00.instance;
case(1):
return CharacterData01.instance;
case(2):
return CharacterData02.instance;
case(3):
return CharacterData03.instance;
case(14):
return CharacterData0E.instance;
case(15): // Private Use
case(16): // Private Use
return CharacterDataPrivateUse.instance;
default:
return CharacterDataUndefined.instance;
}
return switch (ch >>> 16) { //plane 00-16
case 0 -> CharacterData00.instance;
case 1 -> CharacterData01.instance;
case 2 -> CharacterData02.instance;
case 3 -> CharacterData03.instance;
case 14 -> CharacterData0E.instance;
case 15, 16 -> CharacterDataPrivateUse.instance; // Both cases Private Use
default -> CharacterDataUndefined.instance;
};
}
}
}