]> granicus.if.org Git - icu/commit
ICU-13530 add UCPTrie/CodePointTrie, switch normalization to use it (#48)
authorMarkus Scherer <markus.icu@gmail.com>
Tue, 14 Aug 2018 21:04:10 +0000 (14:04 -0700)
committerShane Carr <shane@unicode.org>
Thu, 27 Sep 2018 21:27:38 +0000 (14:27 -0700)
commitfe3eb3ed5c82d9fc9bf5880f5b26096d04f69173
tree3c013dd6658b87abed2832c09b2d54fbcdab4685
parent8a52f44951a459721ede57a1f2ea3621ac852dfc
ICU-13530 add UCPTrie/CodePointTrie, switch normalization to use it (#48)

* ICU-13530 copy C/C++ files UTrie2 -> UTrie3

X-SVN-Rev: 40754

* ICU-13530 UTrie3 new files copied from UTrie2: rename types/functions/macros

X-SVN-Rev: 40755

* ICU-13530 debug-print building each UTrie2

X-SVN-Rev: 40756

* ICU-13530 remove two-byte-UTF-8 errorValue block; move highValue from end of data array into header; add errorValue to header

X-SVN-Rev: 40762

* ICU-13530 UTrie3 U16_NEXT/PREV: errorValue for unpaired surrogates

X-SVN-Rev: 40763

* ICU-13530 no more separate values for lead surrogate code units

X-SVN-Rev: 40764

* ICU-13530 change from 11:5 trie bits to 10:6 for simpler UTF-8 code

X-SVN-Rev: 40766

* ICU-13530 UTrie2 build UTrie3 as well, print sizes

X-SVN-Rev: 40767

* ICU-13530 debug-print countSame, sumOverlaps, countInitial

X-SVN-Rev: 40768

* ICU-13530 debug-print whether trie is for CanonIterData

X-SVN-Rev: 40769

* ICU-13530 no index-shift for BMP data, no separate index-2 for 2-byte UTF-8; builder changes incomplete

X-SVN-Rev: 40777

* ICU-13530 remove errorValue and highStart from UNewTrie3

X-SVN-Rev: 40778

* ICU-13530 rewrite UTrie3 builder code

X-SVN-Rev: 40783

* ICU-13530 UTrie3 bug fixes

X-SVN-Rev: 40788

* ICU-13530 fully re-inline _UTRIE3_U8_NEXT()

X-SVN-Rev: 40790

* ICU-13530 find most common all-same data block for dataNullBlock and initialValue

X-SVN-Rev: 40792

* ICU-13530 UTrie3 iterator functions take start and return the end of a range, rather than callback call for each range

X-SVN-Rev: 40800

* ICU-13530 mask off unused data value bits before building a UTrie3 with values less than 32 bits wide

X-SVN-Rev: 40803

* ICU-13530 split utrie3builder.h out of utrie3.h

X-SVN-Rev: 40804

* ICU-13530 separate types UTrie3 vs. UTrie3Builder, implement builder as wrapper over C++ class Trie3Builder in .cpp

X-SVN-Rev: 40809

* ICU-13530 function to make a UTrie3Builder from a UTrie3

X-SVN-Rev: 40810

* ICU-13530 debug-print some data; some cleanup

X-SVN-Rev: 40865

* ICU-13530 BMP 10:6 but supplementary 10:6:4

X-SVN-Rev: 40984

* ICU-13530 move errorValue & highValue to the end of the data table, minimal padding to 4 bytes

X-SVN-Rev: 41011

* ICU-13530 index-1 table gap of index-2 null blocks

X-SVN-Rev: 41018

* ICU-13530 test with more than 128k compacted data

X-SVN-Rev: 41034

* ICU-13530 supplementary bits 11:5:4 saves a little space

X-SVN-Rev: 41039

* ICU-13530 supplementary bits 6:5:5:4 instead of gap: about same size but simpler

X-SVN-Rev: 41050

* ICU-13530 remove unnecessary utrie3_clone(built trie)

X-SVN-Rev: 41058

* ICU-13530 remove unnecessary UTrie3StringIterator

X-SVN-Rev: 41059

* ICU-13530 back to UTRIE3_GET...() macros *returning* data values

X-SVN-Rev: 41060

* ICU-13530 fast vs. small

X-SVN-Rev: 41066

* ICU-13530 always load NFC data, add simple normalization performance test

X-SVN-Rev: 41110

* ICU-13530 change normalization main trie to UTrie3 with special values for lead surrogates; forbid non-inert surrogate code *points* because unable to store values different from code *units*; runtime code work around that for code point lookup and iteration; adjust UTS 46 for normalization no longer mapping unpaired surrogates to U+FFFD

X-SVN-Rev: 41122

* ICU-13530 simplenormperf bug fix and NFC base line

X-SVN-Rev: 41126

* ICU-13530 move normalization getRange skipping lead surrogates to API getRangeSkipLead()

X-SVN-Rev: 41182

* ICU-13530 switch CanonIterData and gennorm2 Norms to UTrie3

X-SVN-Rev: 41183

* ICU-13530 remove unused overwrite parameter from setRange()

X-SVN-Rev: 41184

* ICU-13530 getRange skip lead -> fixed surrogates

X-SVN-Rev: 41219

* ICU-13530 minor cleanup

X-SVN-Rev: 41221

* ICU-13530 UTS 46 code map unpaired surrogates to U+FFFD before normalization

X-SVN-Rev: 41224

* ICU-13530 minor internal-docs cleanup

X-SVN-Rev: 41225

* ICU-13530 rename UTrie3 to UCPTrie, and other name changes

X-SVN-Rev: 41226

* ICU-13530 add 8-bit data option; add type-any & valueBits-any for fromBinary(); macros consistently source type then data width

X-SVN-Rev: 41234

* ICU-13530 scrub the API docs for the proposal

X-SVN-Rev: 41319

* ICU-13530 tag internal definitions as such, or move them to an internal header

X-SVN-Rev: 41320

* ICU-13530 Java API skeleton

X-SVN-Rev: 41326

* ICU-13530 API feedback: ValueWidth, MutableCodePointTrie, base CodePointMap, ...

X-SVN-Rev: 41382

* ICU-13530 add UCPTrie valueWidth field and padding, and combine data pointers into a union

X-SVN-Rev: 41408

* ICU-13530 switch some macros to using dataAccess parameter: separate index vs. data lookups, no macro variant for each value width

X-SVN-Rev: 41409

* ICU-13530 StringIterator is no longer a java.util.Iterator (bad fit)

X-SVN-Rev: 41455

* ICU-13530 CodePointTrie.java code complete

X-SVN-Rev: 41518

* ICU-13530 finish Java port incl test; keep C++ parallel

* ICU-13530 adjust API for feedback: rename HandleValue to FilterValue, change getRange+getRangeFixedSurr(bool allSurr) to enum RangeOption+getRange(enum option); change remaining C macros to use dataAccess for 16/32/8-bit value widths; fix/clarify some API docs

* ICU-13530 add javadoc

* ICU-13530 document UCPTrie binary data format

* ICU-13530 update .nrm formatVersion 3->4, document change in surrogate handling with new trie

* ICU-13530 re-hardcode NFC data

* move trie swapper code into new file; add new files to Windows project files; turn off trie debugging

* ICU-13530 minor cleanup

* ICU-13530 test more range starts; fix a C test leak

* ICU-13530 regenerate Java data from scratch

* ICU-13530 review feedback changes: API docs typos, more @internal, C++11 field initializers, fix potential leak in MutableCodePointTrie::fromUCPTrie()

* ICU-13530 rename interface FilterValue to ValueFilter
60 files changed:
icu4c/source/common/Makefile.in
icu4c/source/common/common.vcxproj
icu4c/source/common/common.vcxproj.filters
icu4c/source/common/common_uwp.vcxproj
icu4c/source/common/loadednormalizer2impl.cpp
icu4c/source/common/norm2_nfc_data.h
icu4c/source/common/normalizer2.cpp
icu4c/source/common/normalizer2impl.cpp
icu4c/source/common/normalizer2impl.h
icu4c/source/common/ucnvsel.cpp
icu4c/source/common/ucol_swp.cpp
icu4c/source/common/ucptrie.cpp [new file with mode: 0644]
icu4c/source/common/ucptrie_impl.h [new file with mode: 0644]
icu4c/source/common/udataswp.h
icu4c/source/common/umutablecptrie.cpp [new file with mode: 0644]
icu4c/source/common/unicode/ucptrie.h [new file with mode: 0644]
icu4c/source/common/unicode/umutablecptrie.h [new file with mode: 0644]
icu4c/source/common/utrie.h
icu4c/source/common/utrie2.cpp
icu4c/source/common/utrie2.h
icu4c/source/common/utrie2_builder.cpp
icu4c/source/common/utrie2_impl.h
icu4c/source/common/utrie_swap.cpp [new file with mode: 0644]
icu4c/source/common/uts46.cpp
icu4c/source/data/in/nfc.nrm
icu4c/source/data/in/nfkc.nrm
icu4c/source/data/in/nfkc_cf.nrm
icu4c/source/data/in/uts46.nrm
icu4c/source/data/unidata/norm2/uts46.txt
icu4c/source/i18n/uspoof_impl.h
icu4c/source/test/cintltst/Makefile.in
icu4c/source/test/cintltst/cintltst.vcxproj
icu4c/source/test/cintltst/cintltst.vcxproj.filters
icu4c/source/test/cintltst/cutiltst.c
icu4c/source/test/cintltst/trie2test.c
icu4c/source/test/cintltst/ucptrietest.c [new file with mode: 0644]
icu4c/source/test/intltest/tstnorm.cpp
icu4c/source/test/perf/normperf/Makefile.in
icu4c/source/test/perf/normperf/simplenormperf.cpp [new file with mode: 0644]
icu4c/source/test/testdata/testnorm.txt
icu4c/source/tools/gennorm2/gennorm2.cpp
icu4c/source/tools/gennorm2/n2builder.cpp
icu4c/source/tools/gennorm2/n2builder.h
icu4c/source/tools/gennorm2/norms.cpp
icu4c/source/tools/gennorm2/norms.h
icu4c/source/tools/genrb/parse.cpp
icu4c/source/tools/toolutil/swapimpl.cpp
icu4c/source/tools/toolutil/writesrc.cpp
icu4c/source/tools/toolutil/writesrc.h
icu4j/main/classes/core/src/com/ibm/icu/impl/ICUBinary.java
icu4j/main/classes/core/src/com/ibm/icu/impl/Normalizer2Impl.java
icu4j/main/classes/core/src/com/ibm/icu/impl/UTS46.java
icu4j/main/classes/core/src/com/ibm/icu/util/CodePointMap.java [new file with mode: 0644]
icu4j/main/classes/core/src/com/ibm/icu/util/CodePointTrie.java [new file with mode: 0644]
icu4j/main/classes/core/src/com/ibm/icu/util/MutableCodePointTrie.java [new file with mode: 0644]
icu4j/main/shared/data/icudata.jar [changed mode: 0755->0644]
icu4j/main/shared/data/icutzdata.jar
icu4j/main/shared/data/testdata.jar [changed mode: 0755->0644]
icu4j/main/tests/core/src/com/ibm/icu/dev/test/normalizer/BasicTest.java
icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/CodePointTrieTest.java [new file with mode: 0644]