mirrors/phobos
1
0
Fork 0
mirror of https://github.com/dlang/phobos.git synced 2025-04-26 21:22:20 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fixed unexplained rebase conflicts

Browse source
This commit is contained in:
Ate Eskola 2023-01-14 17:11:21 +02:00
parent e53a0aba9f
commit 6e79e72334
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
std/uni/package.d
View file

@ -7043,9 +7043,9 @@ template genericDecodeGrapheme(bool getValue)
mixin(eat);
goto L_End;
case Emoji:
if (!extend[ch])
if (!graphemeExtend[ch])
{
static assert(!extend['\u200D']);
static assert(!graphemeExtend['\u200D']);
if (ch == '\u200D')
state = EmojiZWJ;
else
@ -7120,7 +7120,7 @@ template genericDecodeGrapheme(bool getValue)
{
ch = range.front;
// extend & spacing marks
if (!extend[ch] && !spacingMark[ch] && ch != '\u200D')
if (!graphemeExtend[ch] && !spacingMark[ch] && ch != '\u200D')
break;
mixin(eat);
}
@ -10651,22 +10651,22 @@ private:
auto graphemeExtendTrie()
{
import std.internal.unicode_grapheme : ExtendTrieEntries;
static immutable res = asTrie(ExtendTrieEntries);
import std.internal.unicode_grapheme : graphemeExtendTrieEntries;
static immutable res = asTrie(graphemeExtendTrieEntries);
return res;
}
auto hangLV()
{
import std.internal.unicode_grapheme : LVTrieEntries;
static immutable res = asTrie(LVTrieEntries);
import std.internal.unicode_grapheme : hangulLVTrieEntries;
static immutable res = asTrie(hangulLVTrieEntries);
return res;
}
auto hangLVT()
{
import std.internal.unicode_grapheme : LVTTrieEntries;
static immutable res = asTrie(LVTTrieEntries);
import std.internal.unicode_grapheme : hangulLVTTrieEntries;
static immutable res = asTrie(hangulLVTTrieEntries);
return res;
}