1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

8263091: Remove CharacterData.isOtherUppercase/-Lowercase

Browse Source 
Reviewed-by: rriggs, naoto, iris
This commit is contained in:
Claes Redestad 2021-03-08 10:34:57 +00:00
parent 13625bebd0
commit a0c3f24218
8 changed files with 27 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
make/data/characterdata/CharacterData00.java.template
View File

@ -84,16 +84,6 @@ class CharacterData00 extends CharacterData {
return (props & $$maskType); return (props & $$maskType);
} }
boolean isOtherLowercase(int ch) {
int props = getPropertiesEx(ch);
return (props & $$maskOtherLowercase) != 0;
}
boolean isOtherUppercase(int ch) {
int props = getPropertiesEx(ch);
return (props & $$maskOtherUppercase) != 0;
}
boolean isOtherAlphabetic(int ch) { boolean isOtherAlphabetic(int ch) {
int props = getPropertiesEx(ch); int props = getPropertiesEx(ch);
return (props & $$maskOtherAlphabetic) != 0; return (props & $$maskOtherAlphabetic) != 0;
@ -765,13 +755,13 @@ class CharacterData00 extends CharacterData {
} }
boolean isLowerCase(int ch) { boolean isLowerCase(int ch) {
int props = getProperties(ch); return (getProperties(ch) & $$maskType) == Character.LOWERCASE_LETTER
return (props & $$maskType) == Character.LOWERCASE_LETTER; || (getPropertiesEx(ch) & $$maskOtherLowercase) != 0;
} }
boolean isUpperCase(int ch) { boolean isUpperCase(int ch) {
int props = getProperties(ch); return (getProperties(ch) & $$maskType) == Character.UPPERCASE_LETTER
return (props & $$maskType) == Character.UPPERCASE_LETTER; || (getPropertiesEx(ch) & $$maskOtherUppercase) != 0;
} }
boolean isWhitespace(int ch) { boolean isWhitespace(int ch) {

18
make/data/characterdata/CharacterData01.java.template
View File

@ -83,16 +83,6 @@ class CharacterData01 extends CharacterData {
return (props & $$maskType); return (props & $$maskType);
} }
boolean isOtherLowercase(int ch) {
int props = getPropertiesEx(ch);
return (props & $$maskOtherLowercase) != 0;
}
boolean isOtherUppercase(int ch) {
int props = getPropertiesEx(ch);
return (props & $$maskOtherUppercase) != 0;
}
boolean isOtherAlphabetic(int ch) { boolean isOtherAlphabetic(int ch) {
int props = getPropertiesEx(ch); int props = getPropertiesEx(ch);
return (props & $$maskOtherAlphabetic) != 0; return (props & $$maskOtherAlphabetic) != 0;
@ -503,13 +493,13 @@ class CharacterData01 extends CharacterData {
} }
boolean isLowerCase(int ch) { boolean isLowerCase(int ch) {
int props = getProperties(ch); return (getProperties(ch) & $$maskType) == Character.LOWERCASE_LETTER
return (props & $$maskType) == Character.LOWERCASE_LETTER; || (getPropertiesEx(ch) & $$maskOtherLowercase) != 0;
} }
boolean isUpperCase(int ch) { boolean isUpperCase(int ch) {
int props = getProperties(ch); return (getProperties(ch) & $$maskType) == Character.UPPERCASE_LETTER
return (props & $$maskType) == Character.UPPERCASE_LETTER; || (getPropertiesEx(ch) & $$maskOtherUppercase) != 0;
} }
boolean isWhitespace(int ch) { boolean isWhitespace(int ch) {

19
make/data/characterdata/CharacterData02.java.template
View File

@ -77,16 +77,6 @@ class CharacterData02 extends CharacterData {
return props; return props;
} }
boolean isOtherLowercase(int ch) {
int props = getPropertiesEx(ch);
return (props & $$maskOtherLowercase) != 0;
}
boolean isOtherUppercase(int ch) {
int props = getPropertiesEx(ch);
return (props & $$maskOtherUppercase) != 0;
}
boolean isOtherAlphabetic(int ch) { boolean isOtherAlphabetic(int ch) {
int props = getPropertiesEx(ch); int props = getPropertiesEx(ch);
return (props & $$maskOtherAlphabetic) != 0; return (props & $$maskOtherAlphabetic) != 0;
@ -222,15 +212,16 @@ class CharacterData02 extends CharacterData {
} }
boolean isLowerCase(int ch) { boolean isLowerCase(int ch) {
int props = getProperties(ch); return (getProperties(ch) & $$maskType) == Character.LOWERCASE_LETTER
return (props & $$maskType) == Character.LOWERCASE_LETTER; || (getPropertiesEx(ch) & $$maskOtherLowercase) != 0;
} }
boolean isUpperCase(int ch) { boolean isUpperCase(int ch) {
int props = getProperties(ch); return (getProperties(ch) & $$maskType) == Character.UPPERCASE_LETTER
return (props & $$maskType) == Character.UPPERCASE_LETTER; || (getPropertiesEx(ch) & $$maskOtherUppercase) != 0;
} }
boolean isWhitespace(int ch) { boolean isWhitespace(int ch) {
return (getProperties(ch) & $$maskIdentifierInfo) == $$valueJavaWhitespace; return (getProperties(ch) & $$maskIdentifierInfo) == $$valueJavaWhitespace;
} }

18
make/data/characterdata/CharacterData03.java.template
View File

@ -77,16 +77,6 @@ class CharacterData03 extends CharacterData {
return props; return props;
} }
boolean isOtherLowercase(int ch) {
int props = getPropertiesEx(ch);
return (props & $$maskOtherLowercase) != 0;
}
boolean isOtherUppercase(int ch) {
int props = getPropertiesEx(ch);
return (props & $$maskOtherUppercase) != 0;
}
boolean isOtherAlphabetic(int ch) { boolean isOtherAlphabetic(int ch) {
int props = getPropertiesEx(ch); int props = getPropertiesEx(ch);
return (props & $$maskOtherAlphabetic) != 0; return (props & $$maskOtherAlphabetic) != 0;
@ -222,13 +212,13 @@ class CharacterData03 extends CharacterData {
} }
boolean isLowerCase(int ch) { boolean isLowerCase(int ch) {
int props = getProperties(ch); return (getProperties(ch) & $$maskType) == Character.LOWERCASE_LETTER
return (props & $$maskType) == Character.LOWERCASE_LETTER; || (getPropertiesEx(ch) & $$maskOtherLowercase) != 0;
} }
boolean isUpperCase(int ch) { boolean isUpperCase(int ch) {
int props = getProperties(ch); return (getProperties(ch) & $$maskType) == Character.UPPERCASE_LETTER
return (props & $$maskType) == Character.UPPERCASE_LETTER; || (getPropertiesEx(ch) & $$maskOtherUppercase) != 0;
} }
boolean isWhitespace(int ch) { boolean isWhitespace(int ch) {

18
make/data/characterdata/CharacterData0E.java.template
View File

@ -77,16 +77,6 @@ class CharacterData0E extends CharacterData {
return props; return props;
} }
boolean isOtherLowercase(int ch) {
int props = getPropertiesEx(ch);
return (props & $$maskOtherLowercase) != 0;
}
boolean isOtherUppercase(int ch) {
int props = getPropertiesEx(ch);
return (props & $$maskOtherUppercase) != 0;
}
boolean isOtherAlphabetic(int ch) { boolean isOtherAlphabetic(int ch) {
int props = getPropertiesEx(ch); int props = getPropertiesEx(ch);
return (props & $$maskOtherAlphabetic) != 0; return (props & $$maskOtherAlphabetic) != 0;
@ -222,13 +212,13 @@ class CharacterData0E extends CharacterData {
} }
boolean isLowerCase(int ch) { boolean isLowerCase(int ch) {
int props = getProperties(ch); return (getProperties(ch) & $$maskType) == Character.LOWERCASE_LETTER
return (props & $$maskType) == Character.LOWERCASE_LETTER; || (getPropertiesEx(ch) & $$maskOtherLowercase) != 0;
} }
boolean isUpperCase(int ch) { boolean isUpperCase(int ch) {
int props = getProperties(ch); return (getProperties(ch) & $$maskType) == Character.UPPERCASE_LETTER
return (props & $$maskType) == Character.UPPERCASE_LETTER; || (getPropertiesEx(ch) & $$maskOtherUppercase) != 0;
} }
boolean isWhitespace(int ch) { boolean isWhitespace(int ch) {

17
make/data/characterdata/CharacterDataLatin1.java.template
View File

@ -87,24 +87,13 @@ class CharacterDataLatin1 extends CharacterData {
@IntrinsicCandidate @IntrinsicCandidate
boolean isLowerCase(int ch) { boolean isLowerCase(int ch) {
int props = getProperties(ch); return (getProperties(ch) & $$maskType) == Character.LOWERCASE_LETTER
return (props & $$maskType) == Character.LOWERCASE_LETTER; || (getPropertiesEx(ch) & $$maskOtherLowercase) != 0; // 0xaa, 0xba
} }
@IntrinsicCandidate @IntrinsicCandidate
boolean isUpperCase(int ch) { boolean isUpperCase(int ch) {
int props = getProperties(ch); return (getProperties(ch) & $$maskType) == Character.UPPERCASE_LETTER;
return (props & $$maskType) == Character.UPPERCASE_LETTER;
}
boolean isOtherLowercase(int ch) {
int props = getPropertiesEx(ch);
return (props & $$maskOtherLowercase) != 0;
}
boolean isOtherUppercase(int ch) {
int props = getPropertiesEx(ch);
return (props & $$maskOtherUppercase) != 0;
} }
boolean isOtherAlphabetic(int ch) { boolean isOtherAlphabetic(int ch) {

6
src/java.base/share/classes/java/lang/Character.java
View File

@ -9495,8 +9495,7 @@ class Character implements java.io.Serializable, Comparable<Character>, Constabl
* @since 1.5 * @since 1.5
*/ */
public static boolean isLowerCase(int codePoint) { public static boolean isLowerCase(int codePoint) {
return CharacterData.of(codePoint).isLowerCase(codePoint) || return CharacterData.of(codePoint).isLowerCase(codePoint);
CharacterData.of(codePoint).isOtherLowercase(codePoint);
} }
/** /**
@ -9561,8 +9560,7 @@ class Character implements java.io.Serializable, Comparable<Character>, Constabl
* @since 1.5 * @since 1.5
*/ */
public static boolean isUpperCase(int codePoint) { public static boolean isUpperCase(int codePoint) {
return CharacterData.of(codePoint).isUpperCase(codePoint) || return CharacterData.of(codePoint).isUpperCase(codePoint);
CharacterData.of(codePoint).isOtherUppercase(codePoint);
} }
/** /**

8
src/java.base/share/classes/java/lang/CharacterData.java
View File

@ -54,14 +54,6 @@ abstract class CharacterData {
return null; return null;
} }
boolean isOtherLowercase(int ch) {
return false;
}
boolean isOtherUppercase(int ch) {
return false;
}
boolean isOtherAlphabetic(int ch) { boolean isOtherAlphabetic(int ch) {
return false; return false;
} }