diff options
Diffstat (limited to 'libgo/go/exp/norm/input.go')
| -rw-r--r-- | libgo/go/exp/norm/input.go | 29 |
1 files changed, 10 insertions, 19 deletions
diff --git a/libgo/go/exp/norm/input.go b/libgo/go/exp/norm/input.go index 7276c66cc12..5c0968ba58c 100644 --- a/libgo/go/exp/norm/input.go +++ b/libgo/go/exp/norm/input.go @@ -11,9 +11,8 @@ type input interface { skipNonStarter(p int) int appendSlice(buf []byte, s, e int) []byte copySlice(buf []byte, s, e int) - charinfo(p int) (uint16, int) - decomposeNFC(p int) uint16 - decomposeNFKC(p int) uint16 + charinfoNFC(p int) (uint16, int) + charinfoNFKC(p int) (uint16, int) hangul(p int) rune } @@ -42,16 +41,12 @@ func (s inputString) copySlice(buf []byte, b, e int) { copy(buf, s[b:e]) } -func (s inputString) charinfo(p int) (uint16, int) { - return charInfoTrie.lookupString(string(s[p:])) +func (s inputString) charinfoNFC(p int) (uint16, int) { + return nfcTrie.lookupString(string(s[p:])) } -func (s inputString) decomposeNFC(p int) uint16 { - return nfcDecompTrie.lookupStringUnsafe(string(s[p:])) -} - -func (s inputString) decomposeNFKC(p int) uint16 { - return nfkcDecompTrie.lookupStringUnsafe(string(s[p:])) +func (s inputString) charinfoNFKC(p int) (uint16, int) { + return nfkcTrie.lookupString(string(s[p:])) } func (s inputString) hangul(p int) rune { @@ -84,16 +79,12 @@ func (s inputBytes) copySlice(buf []byte, b, e int) { copy(buf, s[b:e]) } -func (s inputBytes) charinfo(p int) (uint16, int) { - return charInfoTrie.lookup(s[p:]) -} - -func (s inputBytes) decomposeNFC(p int) uint16 { - return nfcDecompTrie.lookupUnsafe(s[p:]) +func (s inputBytes) charinfoNFC(p int) (uint16, int) { + return nfcTrie.lookup(s[p:]) } -func (s inputBytes) decomposeNFKC(p int) uint16 { - return nfkcDecompTrie.lookupUnsafe(s[p:]) +func (s inputBytes) charinfoNFKC(p int) (uint16, int) { + return nfkcTrie.lookup(s[p:]) } func (s inputBytes) hangul(p int) rune { |