archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 14:54:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8305107: Emoji related binary properties in RegEx

Browse source 
Reviewed-by: iris, rriggs, jpai
This commit is contained in:
Naoto Sato 2023-04-05 16:04:27 +00:00
parent 5919fad1f4
commit ee3023359c
3 changed files with 52 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/java.base/share/classes/java/util/regex/CharPredicates.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -196,6 +196,12 @@ class CharPredicates {
case "ALPHABETIC" -> ALPHABETIC();
case "ASSIGNED" -> ASSIGNED();
case "CONTROL" -> CONTROL();
case "EMOJI" -> EMOJI();
case "EMOJI_PRESENTATION" -> EMOJI_PRESENTATION();
case "EMOJI_MODIFIER" -> EMOJI_MODIFIER();
case "EMOJI_MODIFIER_BASE" -> EMOJI_MODIFIER_BASE();
case "EMOJI_COMPONENT" -> EMOJI_COMPONENT();
case "EXTENDED_PICTOGRAPHIC" -> EXTENDED_PICTOGRAPHIC();
case "HEXDIGIT", "HEX_DIGIT" -> HEX_DIGIT();
case "IDEOGRAPHIC" -> IDEOGRAPHIC();
case "JOINCONTROL", "JOIN_CONTROL" -> JOIN_CONTROL();
@ -421,4 +427,27 @@ class CharPredicates {
return ch -> ch < 128 && ASCII.isSpace(ch);
}
/////////////////////////////////////////////////////////////////////////////
/**
* Emoji related binary properties
*/
static final CharPredicate EMOJI() {
return Character::isEmoji;
}
static final CharPredicate EMOJI_PRESENTATION() {
return Character::isEmojiPresentation;
}
static final CharPredicate EMOJI_MODIFIER() {
return Character::isEmojiModifier;
}
static final CharPredicate EMOJI_MODIFIER_BASE() {
return Character::isEmojiModifierBase;
}
static final CharPredicate EMOJI_COMPONENT() {
return Character::isEmojiComponent;
}
static final CharPredicate EXTENDED_PICTOGRAPHIC() {
return Character::isExtendedPictographic;
}
}

6
src/java.base/share/classes/java/util/regex/Pattern.java
View file

@ -638,6 +638,12 @@ import jdk.internal.util.regex.Grapheme;
* <li> Join_Control
* <li> Noncharacter_Code_Point
* <li> Assigned
* <li> Emoji
* <li> Emoji_Presentation
* <li> Emoji_Modifier
* <li> Emoji_Modifier_Base
* <li> Emoji_Component
* <li> Extended_Pictographic
* </ul>
* <p>
* The following <b>Predefined Character classes</b> and <b>POSIX character classes</b>