organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-10 07:39:16 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-8619 move some collation file data structure definitions from i18n/ucol_imp.h to common/ucol_data.h (new file)

Browse source 
X-SVN-Rev: 30271
This commit is contained in:
Markus Scherer 2011-07-03 04:07:02 +00:00
parent ab842070fd
commit a74d503edb
6 changed files with 99 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
icu4c/source/common/Makefile.in
View file

@ -60,7 +60,7 @@ CXXFLAGS += $(LIBCXXFLAGS)
ifneq ($(top_builddir),$(top_srcdir))
CPPFLAGS += -I$(top_builddir)/common
endif
CPPFLAGS += -I$(srcdir) -I$(top_srcdir)/i18n $(LIBCPPFLAGS) $(CPPFLAGSICUUC)
CPPFLAGS += -I$(srcdir) $(LIBCPPFLAGS) $(CPPFLAGSICUUC)
# we want DEFS here, because we want icucfg.h
DEFS += -DU_COMMON_IMPLEMENTATION -DU_HAVE_ICUCFG
LDFLAGS += $(LDFLAGSICUUC)

1
icu4c/source/common/common.vcxproj
View file

@ -536,6 +536,7 @@
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
</CustomBuild>
<ClInclude Include="ubrkimpl.h" />
<ClInclude Include="ucol_data.h" />
<ClInclude Include="ucol_swp.h" />
<ClInclude Include="hash.h" />
<ClInclude Include="propsvec.h" />

3
icu4c/source/common/common.vcxproj.filters
View file

@ -567,6 +567,9 @@
<ClInclude Include="ubrkimpl.h">
<Filter>break iteration</Filter>
</ClInclude>
<ClInclude Include="ucol_data.h">
<Filter>collation</Filter>
</ClInclude>
<ClInclude Include="ucol_swp.h">
<Filter>collation</Filter>
</ClInclude>

87
icu4c/source/common/ucol_data.h Normal file
View file

@ -0,0 +1,87 @@
/*
*******************************************************************************
* Copyright (C) 2000-2011, International Business Machines
* Corporation and others. All Rights Reserved.
*******************************************************************************
* file name: ucol_data.h
* encoding: US-ASCII
* tab size: 8 (not used)
* indentation:4
*
* created on: 2011jul02
* created by: Markus Scherer
*
* Private implementation header for C/C++ collation.
* Some file data structure definitions were moved here from i18n/ucol_imp.h
* so that the common library (via ucol_swp.cpp) need not depend on the i18n library at all.
*
* We do not want to move the collation swapper to the i18n library because
* a) the resource bundle swapper depends on it and would have to move too, and
* b) we might want to eventually implement runtime data swapping,
* which might (or might not) be easier if all swappers are in the common library.
*/
#ifndef __UCOL_DATA_H__
#define __UCOL_DATA_H__
#include "unicode/utypes.h"
#if !UCONFIG_NO_COLLATION
/* let us know whether reserved fields are reset to zero or junked */
#define UCOL_HEADER_MAGIC 0x20030618
typedef struct {
int32_t size;
/* all the offsets are in bytes */
/* to get the address add to the header address and cast properly */
uint32_t options; /* these are the default options for the collator */
uint32_t UCAConsts; /* structure which holds values for indirect positioning and implicit ranges */
uint32_t contractionUCACombos; /* this one is needed only for UCA, to copy the appropriate contractions */
uint32_t magic; /* magic number - lets us know whether reserved data is reset or junked */
uint32_t mappingPosition; /* const uint8_t *mappingPosition; */
uint32_t expansion; /* uint32_t *expansion; */
uint32_t contractionIndex; /* UChar *contractionIndex; */
uint32_t contractionCEs; /* uint32_t *contractionCEs; */
uint32_t contractionSize; /* needed for various closures */
/*int32_t latinOneMapping;*/ /* this is now handled in the trie itself *//* fast track to latin1 chars */
uint32_t endExpansionCE; /* array of last collation element in
expansion */
uint32_t expansionCESize; /* array of maximum expansion size
corresponding to the expansion
collation elements with last element
in endExpansionCE*/
int32_t endExpansionCECount; /* size of endExpansionCE */
uint32_t unsafeCP; /* hash table of unsafe code points */
uint32_t contrEndCP; /* hash table of final code points */
/* in contractions. */
int32_t contractionUCACombosSize; /* number of UCA contraction items. */
/*Length is contractionUCACombosSize*contractionUCACombosWidth*sizeof(UChar) */
UBool jamoSpecial; /* is jamoSpecial */
UBool isBigEndian; /* is this data big endian? from the UDataInfo header*/
uint8_t charSetFamily; /* what is the charset family of this data from the UDataInfo header*/
uint8_t contractionUCACombosWidth; /* width of UCA combos field */
UVersionInfo version;
UVersionInfo UCAVersion; /* version of the UCA, read from file */
UVersionInfo UCDVersion; /* UCD version, obtained by u_getUnicodeVersion */
UVersionInfo formatVersion; /* format version from the UDataInfo header */
uint32_t scriptToLeadByte; /* offset to script to lead collation byte mapping data */
uint32_t leadByteToScript; /* offset to lead collation byte to script mapping data */
uint8_t reserved[76]; /* for future use */
} UCATableHeader;
typedef struct {
uint32_t byteSize;
uint32_t tableSize;
uint32_t contsSize;
uint32_t table;
uint32_t conts;
UVersionInfo UCAVersion; /* version of the UCA, read from file */
uint8_t padding[8];
} InverseUCATableHeader;
#endif /* !UCONFIG_NO_COLLATION */
#endif /* __UCOL_DATA_H__ */

6
icu4c/source/common/ucol_swp.cpp
View file

@ -1,11 +1,11 @@
/*
*******************************************************************************
*
* Copyright (C) 2003-2010, International Business Machines
* Copyright (C) 2003-2011, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
* file name: ucol_swp.c
* file name: ucol_swp.cpp
* encoding: US-ASCII
* tab size: 8 (not used)
* indentation:4
@ -20,7 +20,7 @@
#include "utrie.h"
#include "udataswp.h"
#include "cmemory.h"
#include "ucol_imp.h"
#include "ucol_data.h"
#include "ucol_swp.h"
/* swapping ----------------------------------------------------------------- */

55
icu4c/source/i18n/ucol_imp.h
View file

@ -46,6 +46,7 @@
#include "unicode/unistr.h"
#endif
#include "unicode/ucol.h"
#include "ucol_data.h"
#include "utrie.h"
#include "cmemory.h"
@ -171,8 +172,7 @@
* Header is followed by the table and continuation table.
*/
/* let us know whether reserved fields are reset to zero or junked */
#define UCOL_HEADER_MAGIC 0x20030618
/* definition of UCOL_HEADER_MAGIC moved to common/ucol_data.h */
/* UDataInfo for UCA mapping table */
/* dataFormat="UCol" */
@ -855,46 +855,7 @@ typedef struct {
uint32_t UCA_PRIMARY_SPECIAL_MAX; /*0xF0000000*/
} UCAConstants;
typedef struct {
int32_t size;
/* all the offsets are in bytes */
/* to get the address add to the header address and cast properly */
uint32_t options; /* these are the default options for the collator */
uint32_t UCAConsts; /* structure which holds values for indirect positioning and implicit ranges */
uint32_t contractionUCACombos; /* this one is needed only for UCA, to copy the appropriate contractions */
uint32_t magic; /* magic number - lets us know whether reserved data is reset or junked */
uint32_t mappingPosition; /* const uint8_t *mappingPosition; */
uint32_t expansion; /* uint32_t *expansion; */
uint32_t contractionIndex; /* UChar *contractionIndex; */
uint32_t contractionCEs; /* uint32_t *contractionCEs; */
uint32_t contractionSize; /* needed for various closures */
/*int32_t latinOneMapping;*/ /* this is now handled in the trie itself *//* fast track to latin1 chars */
uint32_t endExpansionCE; /* array of last collation element in
expansion */
uint32_t expansionCESize; /* array of maximum expansion size
corresponding to the expansion
collation elements with last element
in endExpansionCE*/
int32_t endExpansionCECount; /* size of endExpansionCE */
uint32_t unsafeCP; /* hash table of unsafe code points */
uint32_t contrEndCP; /* hash table of final code points */
/* in contractions. */
int32_t contractionUCACombosSize; /* number of UCA contraction items. */
/*Length is contractionUCACombosSize*contractionUCACombosWidth*sizeof(UChar) */
UBool jamoSpecial; /* is jamoSpecial */
UBool isBigEndian; /* is this data big endian? from the UDataInfo header*/
uint8_t charSetFamily; /* what is the charset family of this data from the UDataInfo header*/
uint8_t contractionUCACombosWidth; /* width of UCA combos field */
UVersionInfo version;
UVersionInfo UCAVersion; /* version of the UCA, read from file */
UVersionInfo UCDVersion; /* UCD version, obtained by u_getUnicodeVersion */
UVersionInfo formatVersion; /* format version from the UDataInfo header */
uint32_t scriptToLeadByte; /* offset to script to lead collation byte mapping data */
uint32_t leadByteToScript; /* offset to lead collation byte to script mapping data */
uint8_t reserved[76]; /* for future use */
} UCATableHeader;
/* definition of UCATableHeader moved to common/ucol_data.h */
#define U_UNKNOWN_STATE 0
#define U_COLLATOR_STATE 0x01
@ -965,15 +926,7 @@ typedef struct {
U_CDECL_BEGIN
typedef struct {
uint32_t byteSize;
uint32_t tableSize;
uint32_t contsSize;
uint32_t table;
uint32_t conts;
UVersionInfo UCAVersion; /* version of the UCA, read from file */
uint8_t padding[8];
} InverseUCATableHeader;
/* definition of InverseUCATableHeader moved to common/ucol_data.h */
typedef void U_CALLCONV
ResourceCleaner(UCollator *coll);