fe3eb3ed5c
* 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
216 lines
6.8 KiB
C++
216 lines
6.8 KiB
C++
// © 2017 and later: Unicode, Inc. and others.
|
|
// License & terms of use: http://www.unicode.org/copyright.html
|
|
|
|
// norms.h
|
|
// created: 2017jun04 Markus W. Scherer
|
|
// (pulled out of n2builder.cpp)
|
|
|
|
// Storing & manipulating Normalizer2 builder data.
|
|
|
|
#ifndef __NORMS_H__
|
|
#define __NORMS_H__
|
|
|
|
#include "unicode/utypes.h"
|
|
|
|
#if !UCONFIG_NO_NORMALIZATION
|
|
|
|
#include "unicode/errorcode.h"
|
|
#include "unicode/umutablecptrie.h"
|
|
#include "unicode/uniset.h"
|
|
#include "unicode/unistr.h"
|
|
#include "unicode/utf16.h"
|
|
#include "normalizer2impl.h"
|
|
#include "toolutil.h"
|
|
#include "uvectr32.h"
|
|
|
|
U_NAMESPACE_BEGIN
|
|
|
|
class BuilderReorderingBuffer {
|
|
public:
|
|
BuilderReorderingBuffer() : fLength(0), fLastStarterIndex(-1), fDidReorder(FALSE) {}
|
|
void reset() {
|
|
fLength=0;
|
|
fLastStarterIndex=-1;
|
|
fDidReorder=FALSE;
|
|
}
|
|
int32_t length() const { return fLength; }
|
|
UBool isEmpty() const { return fLength==0; }
|
|
int32_t lastStarterIndex() const { return fLastStarterIndex; }
|
|
UChar32 charAt(int32_t i) const { return fArray[i]>>8; }
|
|
uint8_t ccAt(int32_t i) const { return (uint8_t)fArray[i]; }
|
|
UBool didReorder() const { return fDidReorder; }
|
|
|
|
void append(UChar32 c, uint8_t cc);
|
|
void toString(UnicodeString &dest) const;
|
|
|
|
private:
|
|
int32_t fArray[Normalizer2Impl::MAPPING_LENGTH_MASK];
|
|
int32_t fLength;
|
|
int32_t fLastStarterIndex;
|
|
UBool fDidReorder;
|
|
};
|
|
|
|
struct CompositionPair {
|
|
CompositionPair(UChar32 t, UChar32 c) : trail(t), composite(c) {}
|
|
UChar32 trail, composite;
|
|
};
|
|
|
|
struct Norm {
|
|
enum MappingType { NONE, REMOVED, ROUND_TRIP, ONE_WAY };
|
|
|
|
UBool hasMapping() const { return mappingType>REMOVED; }
|
|
|
|
// Requires hasMapping() and well-formed mapping.
|
|
void setMappingCP() {
|
|
UChar32 c;
|
|
if(!mapping->isEmpty() && mapping->length()==U16_LENGTH(c=mapping->char32At(0))) {
|
|
mappingCP=c;
|
|
} else {
|
|
mappingCP=U_SENTINEL;
|
|
}
|
|
}
|
|
|
|
const CompositionPair *getCompositionPairs(int32_t &length) const {
|
|
if(compositions==nullptr) {
|
|
length=0;
|
|
return nullptr;
|
|
} else {
|
|
length=compositions->size()/2;
|
|
return reinterpret_cast<const CompositionPair *>(compositions->getBuffer());
|
|
}
|
|
}
|
|
UChar32 combine(UChar32 trail) const;
|
|
|
|
UnicodeString *mapping;
|
|
UnicodeString *rawMapping; // non-nullptr if the mapping is further decomposed
|
|
UChar32 mappingCP; // >=0 if mapping to 1 code point
|
|
int32_t mappingPhase;
|
|
MappingType mappingType;
|
|
|
|
UVector32 *compositions; // (trail, composite) pairs
|
|
uint8_t cc, leadCC, trailCC;
|
|
UBool combinesBack;
|
|
UBool hasCompBoundaryBefore, hasCompBoundaryAfter;
|
|
|
|
/**
|
|
* Overall type of normalization properties.
|
|
* Set after most processing is done.
|
|
*
|
|
* Corresponds to the rows in the chart on
|
|
* http://site.icu-project.org/design/normalization/custom
|
|
* in numerical (but reverse visual) order.
|
|
*
|
|
* YES_NO means composition quick check=yes, decomposition QC=no -- etc.
|
|
*/
|
|
enum Type {
|
|
/** Initial value until most processing is done. */
|
|
UNKNOWN,
|
|
/** No mapping, does not combine, ccc=0. */
|
|
INERT,
|
|
/** Starter, no mapping, has compositions. */
|
|
YES_YES_COMBINES_FWD,
|
|
/** Starter with a round-trip mapping and compositions. */
|
|
YES_NO_COMBINES_FWD,
|
|
/** Starter with a round-trip mapping but no compositions. */
|
|
YES_NO_MAPPING_ONLY,
|
|
/** Has a one-way mapping which is comp-normalized. */
|
|
NO_NO_COMP_YES,
|
|
/** Has a one-way mapping which is not comp-normalized but has a comp boundary before. */
|
|
NO_NO_COMP_BOUNDARY_BEFORE,
|
|
/** Has a one-way mapping which does not have a comp boundary before. */
|
|
NO_NO_COMP_NO_MAYBE_CC,
|
|
/** Has a one-way mapping to the empty string. */
|
|
NO_NO_EMPTY,
|
|
/** Has an algorithmic one-way mapping to a single code point. */
|
|
NO_NO_DELTA,
|
|
/**
|
|
* Combines both backward and forward, has compositions.
|
|
* Allowed, but not normally used.
|
|
*/
|
|
MAYBE_YES_COMBINES_FWD,
|
|
/** Combines only backward. */
|
|
MAYBE_YES_SIMPLE,
|
|
/** Non-zero ccc but does not combine backward. */
|
|
YES_YES_WITH_CC
|
|
} type;
|
|
/** Offset into the type's part of the extra data, or the algorithmic-mapping delta. */
|
|
int32_t offset;
|
|
|
|
/**
|
|
* Error string set by processing functions that do not have access
|
|
* to the code point, deferred for readable reporting.
|
|
*/
|
|
const char *error;
|
|
};
|
|
|
|
class Norms {
|
|
public:
|
|
Norms(UErrorCode &errorCode);
|
|
~Norms();
|
|
|
|
int32_t length() const { return utm_countItems(normMem); }
|
|
const Norm &getNormRefByIndex(int32_t i) const { return norms[i]; }
|
|
Norm &getNormRefByIndex(int32_t i) { return norms[i]; }
|
|
|
|
Norm *allocNorm();
|
|
/** Returns an existing Norm unit, or nullptr if c has no data. */
|
|
Norm *getNorm(UChar32 c);
|
|
const Norm *getNorm(UChar32 c) const;
|
|
/** Returns a Norm unit, creating a new one if necessary. */
|
|
Norm *createNorm(UChar32 c);
|
|
/** Returns an existing Norm unit, or an immutable empty object if c has no data. */
|
|
const Norm &getNormRef(UChar32 c) const;
|
|
uint8_t getCC(UChar32 c) const { return getNormRef(c).cc; }
|
|
UBool combinesBack(UChar32 c) const {
|
|
return Hangul::isJamoV(c) || Hangul::isJamoT(c) || getNormRef(c).combinesBack;
|
|
}
|
|
|
|
void reorder(UnicodeString &mapping, BuilderReorderingBuffer &buffer) const;
|
|
|
|
// int32_t highCC not uint8_t so that we can pass in 256 as the upper limit.
|
|
UBool combinesWithCCBetween(const Norm &norm, uint8_t lowCC, int32_t highCC) const;
|
|
|
|
class Enumerator {
|
|
public:
|
|
Enumerator(Norms &n) : norms(n) {}
|
|
virtual ~Enumerator();
|
|
/** Called for enumerated value!=0. */
|
|
virtual void rangeHandler(UChar32 start, UChar32 end, Norm &norm) = 0;
|
|
protected:
|
|
Norms &norms;
|
|
};
|
|
|
|
void enumRanges(Enumerator &e);
|
|
|
|
UnicodeSet ccSet, mappingSet;
|
|
|
|
private:
|
|
Norms(const Norms &other) = delete;
|
|
Norms &operator=(const Norms &other) = delete;
|
|
|
|
UMutableCPTrie *normTrie;
|
|
UToolMemory *normMem;
|
|
Norm *norms;
|
|
};
|
|
|
|
class CompositionBuilder : public Norms::Enumerator {
|
|
public:
|
|
CompositionBuilder(Norms &n) : Norms::Enumerator(n) {}
|
|
/** Adds a composition mapping for the first character in a round-trip mapping. */
|
|
void rangeHandler(UChar32 start, UChar32 end, Norm &norm) U_OVERRIDE;
|
|
};
|
|
|
|
class Decomposer : public Norms::Enumerator {
|
|
public:
|
|
Decomposer(Norms &n) : Norms::Enumerator(n), didDecompose(FALSE) {}
|
|
/** Decomposes each character of the current mapping. Sets didDecompose if any. */
|
|
void rangeHandler(UChar32 start, UChar32 end, Norm &norm) U_OVERRIDE;
|
|
UBool didDecompose;
|
|
};
|
|
|
|
U_NAMESPACE_END
|
|
|
|
#endif // #if !UCONFIG_NO_NORMALIZATION
|
|
|
|
#endif // __NORMS_H__
|