X-Git-Url: https://git.saurik.com/apple/icu.git/blobdiff_plain/73c04bcfe1096173b00431f0cdc742894b15eef0..51004dcb01e06fef634b61be77ed73dd61cb6db9:/icuSources/common/ubidi_props.c

diff --git a/icuSources/common/ubidi_props.c b/icuSources/common/ubidi_props.c
index 8538c6c5..e6f19743 100644
--- a/icuSources/common/ubidi_props.c
+++ b/icuSources/common/ubidi_props.c
@@ -1,7 +1,7 @@
 /*
 *******************************************************************************
 *
-*   Copyright (C) 2004-2006, International Business Machines
+*   Copyright (C) 2004-2012, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *
 *******************************************************************************
@@ -21,10 +21,9 @@
 #include "unicode/udata.h" /* UDataInfo */
 #include "ucmndata.h" /* DataHeader */
 #include "udatamem.h"
-#include "umutex.h"
 #include "uassert.h"
 #include "cmemory.h"
-#include "utrie.h"
+#include "utrie2.h"
 #include "ubidi_props.h"
 #include "ucln_cmn.h"
 
@@ -34,302 +33,32 @@ struct UBiDiProps {
     const uint32_t *mirrors;
     const uint8_t *jgArray;
 
-    UTrie trie;
+    UTrie2 trie;
     uint8_t formatVersion[4];
 };
 
-/* data loading etc. -------------------------------------------------------- */
-
-#define UBIDI_HARDCODE_DATA 1
-
-#if UBIDI_HARDCODE_DATA
-
-/* ubidi_props_data.c is machine-generated by genbidi --csource */
-#include "ubidi_props_data.c"
-
-#else
-
-static UBool U_CALLCONV
-isAcceptable(void *context,
-             const char *type, const char *name,
-             const UDataInfo *pInfo) {
-    if(
-        pInfo->size>=20 &&
-        pInfo->isBigEndian==U_IS_BIG_ENDIAN &&
-        pInfo->charsetFamily==U_CHARSET_FAMILY &&
-        pInfo->dataFormat[0]==UBIDI_FMT_0 &&    /* dataFormat="BiDi" */
-        pInfo->dataFormat[1]==UBIDI_FMT_1 &&
-        pInfo->dataFormat[2]==UBIDI_FMT_2 &&
-        pInfo->dataFormat[3]==UBIDI_FMT_3 &&
-        pInfo->formatVersion[0]==1 &&
-        pInfo->formatVersion[2]==UTRIE_SHIFT &&
-        pInfo->formatVersion[3]==UTRIE_INDEX_SHIFT
-    ) {
-        UBiDiProps *bdp=(UBiDiProps *)context;
-        uprv_memcpy(bdp->formatVersion, pInfo->formatVersion, 4);
-        return TRUE;
-    } else {
-        return FALSE;
-    }
-}
-
-static UBiDiProps *
-ubidi_openData(UBiDiProps *bdpProto,
-               const uint8_t *bin, int32_t length, UErrorCode *pErrorCode) {
-    UBiDiProps *bdp;
-    int32_t size;
-
-    bdpProto->indexes=(const int32_t *)bin;
-    if( (length>=0 && length<16*4) ||
-        bdpProto->indexes[UBIDI_IX_INDEX_TOP]<16
-    ) {
-        /* length or indexes[] too short for minimum indexes[] length of 16 */
-        *pErrorCode=U_INVALID_FORMAT_ERROR;
-        return NULL;
-    }
-    size=bdpProto->indexes[UBIDI_IX_INDEX_TOP]*4;
-    if(length>=0) {
-        if(length>=size && length>=bdpProto->indexes[UBIDI_IX_LENGTH]) {
-            length-=size;
-        } else {
-            /* length too short for indexes[] or for the whole data length */
-            *pErrorCode=U_INVALID_FORMAT_ERROR;
-            return NULL;
-        }
-    }
-    bin+=size;
-    /* from here on, assume that the sizes of the items fit into the total length */
-
-    /* unserialize the trie, after indexes[] */
-    size=bdpProto->indexes[UBIDI_IX_TRIE_SIZE];
-    utrie_unserialize(&bdpProto->trie, bin, size, pErrorCode);
-    if(U_FAILURE(*pErrorCode)) {
-        return NULL;
-    }
-    bin+=size;
-
-    /* get mirrors[] */
-    size=4*bdpProto->indexes[UBIDI_IX_MIRROR_LENGTH];
-    bdpProto->mirrors=(const uint32_t *)bin;
-    bin+=size;
-
-    /* get jgArray[] */
-    size=bdpProto->indexes[UBIDI_IX_JG_LIMIT]-bdpProto->indexes[UBIDI_IX_JG_START];
-    bdpProto->jgArray=bin;
-    bin+=size;
-
-    /* allocate, copy, and return the new UBiDiProps */
-    bdp=(UBiDiProps *)uprv_malloc(sizeof(UBiDiProps));
-    if(bdp==NULL) {
-        *pErrorCode=U_MEMORY_ALLOCATION_ERROR;
-        return NULL;
-    } else {
-        uprv_memcpy(bdp, bdpProto, sizeof(UBiDiProps));
-        return bdp;
-    }
-}
-
-U_CAPI UBiDiProps * U_EXPORT2
-ubidi_openProps(UErrorCode *pErrorCode) {
-    UBiDiProps bdpProto={ NULL }, *bdp;
-
-    bdpProto.mem=udata_openChoice(NULL, UBIDI_DATA_TYPE, UBIDI_DATA_NAME, isAcceptable, &bdpProto, pErrorCode);
-    if(U_FAILURE(*pErrorCode)) {
-        return NULL;
-    }
-
-    bdp=ubidi_openData(
-            &bdpProto,
-            udata_getMemory(bdpProto.mem),
-            udata_getLength(bdpProto.mem),
-            pErrorCode);
-    if(U_FAILURE(*pErrorCode)) {
-        udata_close(bdpProto.mem);
-        return NULL;
-    } else {
-        return bdp;
-    }
-}
-
-U_CAPI UBiDiProps * U_EXPORT2
-ubidi_openBinary(const uint8_t *bin, int32_t length, UErrorCode *pErrorCode) {
-    UBiDiProps bdpProto={ NULL };
-    const DataHeader *hdr;
-
-    if(U_FAILURE(*pErrorCode)) {
-        return NULL;
-    }
-    if(bin==NULL) {
-        *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR;
-        return NULL;
-    }
-
-    /* check the header */
-    if(length>=0 && length<20) {
-        *pErrorCode=U_INVALID_FORMAT_ERROR;
-        return NULL;
-    }
-    hdr=(const DataHeader *)bin;
-    if(
-        !(hdr->dataHeader.magic1==0xda && hdr->dataHeader.magic2==0x27 &&
-          hdr->info.isBigEndian==U_IS_BIG_ENDIAN &&
-          isAcceptable(&bdpProto, UBIDI_DATA_TYPE, UBIDI_DATA_NAME, &hdr->info))
-    ) {
-        *pErrorCode=U_INVALID_FORMAT_ERROR;
-        return NULL;
-    }
-
-    bin+=hdr->dataHeader.headerSize;
-    if(length>=0) {
-        length-=hdr->dataHeader.headerSize;
-    }
-    return ubidi_openData(&bdpProto, bin, length, pErrorCode);
-}
-
-#endif
-
-U_CAPI void U_EXPORT2
-ubidi_closeProps(UBiDiProps *bdp) {
-    if(bdp!=NULL) {
-#if !UBIDI_HARDCODE_DATA
-        udata_close(bdp->mem);
-#endif
-        uprv_free(bdp);
-    }
-}
+/* ubidi_props_data.h is machine-generated by genbidi --csource */
+#define INCLUDED_FROM_UBIDI_PROPS_C
+#include "ubidi_props_data.h"
 
 /* UBiDiProps singleton ----------------------------------------------------- */
 
-static UBiDiProps *gBdp=NULL, *gBdpDummy=NULL;
-#if !UBIDI_HARDCODE_DATA
-static UErrorCode gErrorCode=U_ZERO_ERROR;
-static int8_t gHaveData=0;
-#endif
-
-static UBool U_CALLCONV
-ubidi_cleanup(void) {
-    ubidi_closeProps(gBdp);
-    gBdp=NULL;
-    ubidi_closeProps(gBdpDummy);
-    gBdpDummy=NULL;
-#if !UBIDI_HARDCODE_DATA
-    gErrorCode=U_ZERO_ERROR;
-    gHaveData=0;
-#endif
-    return TRUE;
-}
-
-U_CAPI const UBiDiProps * U_EXPORT2
-ubidi_getSingleton(UErrorCode *pErrorCode) {
-#if UBIDI_HARDCODE_DATA
-    if(U_FAILURE(*pErrorCode)) {
-        return NULL;
-    }
+U_CFUNC const UBiDiProps *
+ubidi_getSingleton() {
     return &ubidi_props_singleton;
-#else
-    int8_t haveData;
-
-    if(U_FAILURE(*pErrorCode)) {
-        return NULL;
-    }
-
-    UMTX_CHECK(NULL, gHaveData, haveData);
-
-    if(haveData>0) {
-        /* data was loaded */
-        return gBdp;
-    } else if(haveData<0) {
-        /* data loading failed */
-        *pErrorCode=gErrorCode;
-        return NULL;
-    } else /* haveData==0 */ {
-        /* load the data */
-        UBiDiProps *bdp=ubidi_openProps(pErrorCode);
-        if(U_FAILURE(*pErrorCode)) {
-            gHaveData=-1;
-            gErrorCode=*pErrorCode;
-            return NULL;
-        }
-
-        /* set the static variables */
-        umtx_lock(NULL);
-        if(gBdp==NULL) {
-            gBdp=bdp;
-            bdp=NULL;
-            gHaveData=1;
-            ucln_common_registerCleanup(UCLN_COMMON_UBIDI, ubidi_cleanup);
-        }
-        umtx_unlock(NULL);
-
-        ubidi_closeProps(bdp);
-        return gBdp;
-    }
-#endif
-}
-
-U_CAPI const UBiDiProps * U_EXPORT2
-ubidi_getDummy(UErrorCode *pErrorCode) {
-    UBiDiProps *bdp;
-
-    if(U_FAILURE(*pErrorCode)) {
-        return NULL;
-    }
-
-    UMTX_CHECK(NULL, gBdpDummy, bdp);
-
-    if(bdp!=NULL) {
-        /* the dummy object was already created */
-        return bdp;
-    } else /* bdp==NULL */ {
-        /* create the dummy object */
-        int32_t *indexes;
-        
-        bdp=(UBiDiProps *)uprv_malloc(sizeof(UBiDiProps)+UBIDI_IX_TOP*4+UTRIE_DUMMY_SIZE);
-        if(bdp==NULL) {
-            *pErrorCode=U_MEMORY_ALLOCATION_ERROR;
-            return NULL;
-        }
-        uprv_memset(bdp, 0, sizeof(UBiDiProps)+UBIDI_IX_TOP*4);
-
-        bdp->indexes=indexes=(int32_t *)(bdp+1);
-        indexes[UBIDI_IX_INDEX_TOP]=UBIDI_IX_TOP;
-
-        indexes[UBIDI_IX_TRIE_SIZE]=
-            utrie_unserializeDummy(&bdp->trie, indexes+UBIDI_IX_TOP, UTRIE_DUMMY_SIZE, 0, 0, TRUE, pErrorCode);
-        if(U_FAILURE(*pErrorCode)) {
-            uprv_free(bdp);
-            return NULL;
-        }
-
-        bdp->formatVersion[0]=1;
-        bdp->formatVersion[2]=UTRIE_SHIFT;
-        bdp->formatVersion[3]=UTRIE_INDEX_SHIFT;
-
-        /* set the static variables */
-        umtx_lock(NULL);
-        if(gBdpDummy==NULL) {
-            gBdpDummy=bdp;
-            bdp=NULL;
-            ucln_common_registerCleanup(UCLN_COMMON_UBIDI, ubidi_cleanup);
-        }
-        umtx_unlock(NULL);
-
-        uprv_free(bdp);
-        return gBdpDummy;
-    }
 }
 
 /* set of property starts for UnicodeSet ------------------------------------ */
 
 static UBool U_CALLCONV
-_enumPropertyStartsRange(const void *context, UChar32 start, UChar32 limit, uint32_t value) {
+_enumPropertyStartsRange(const void *context, UChar32 start, UChar32 end, uint32_t value) {
     /* add the start code point to the USet */
     const USetAdder *sa=(const USetAdder *)context;
     sa->add(sa->set, start);
     return TRUE;
 }
 
-U_CAPI void U_EXPORT2
+U_CFUNC void
 ubidi_addPropertyStarts(const UBiDiProps *bdp, const USetAdder *sa, UErrorCode *pErrorCode) {
     int32_t i, length;
     UChar32 c, start, limit;
@@ -342,7 +71,7 @@ ubidi_addPropertyStarts(const UBiDiProps *bdp, const USetAdder *sa, UErrorCode *
     }
 
     /* add the start code point of each same-value range of the trie */
-    utrie_enum(&bdp->trie, NULL, _enumPropertyStartsRange, sa);
+    utrie2_enum(&bdp->trie, NULL, _enumPropertyStartsRange, sa);
 
     /* add the code points from the bidi mirroring table */
     length=bdp->indexes[UBIDI_IX_MIRROR_LENGTH];
@@ -374,12 +103,6 @@ ubidi_addPropertyStarts(const UBiDiProps *bdp, const USetAdder *sa, UErrorCode *
     /* (none right now) */
 }
 
-/* data access primitives --------------------------------------------------- */
-
-/* UTRIE_GET16() itself validates c */
-#define GET_PROPS(bdp, c, result) \
-    UTRIE_GET16(&(bdp)->trie, c, result);
-
 /* property access functions ------------------------------------------------ */
 
 U_CFUNC int32_t
@@ -403,27 +126,22 @@ ubidi_getMaxValue(const UBiDiProps *bdp, UProperty which) {
     }
 }
 
-U_CAPI UCharDirection U_EXPORT2
+U_CAPI UCharDirection
 ubidi_getClass(const UBiDiProps *bdp, UChar32 c) {
-    uint32_t props;
-    GET_PROPS(bdp, c, props);
+    uint16_t props=UTRIE2_GET16(&bdp->trie, c);
     return (UCharDirection)UBIDI_GET_CLASS(props);
 }
 
-U_CAPI UBool U_EXPORT2
+U_CFUNC UBool
 ubidi_isMirrored(const UBiDiProps *bdp, UChar32 c) {
-    uint32_t props;
-    GET_PROPS(bdp, c, props);
+    uint16_t props=UTRIE2_GET16(&bdp->trie, c);
     return (UBool)UBIDI_GET_FLAG(props, UBIDI_IS_MIRRORED_SHIFT);
 }
 
-U_CAPI UChar32 U_EXPORT2
+U_CFUNC UChar32
 ubidi_getMirror(const UBiDiProps *bdp, UChar32 c) {
-    uint32_t props;
-    int32_t delta;
-
-    GET_PROPS(bdp, c, props);
-    delta=((int16_t)props)>>UBIDI_MIRROR_DELTA_SHIFT;
+    uint16_t props=UTRIE2_GET16(&bdp->trie, c);
+    int32_t delta=((int16_t)props)>>UBIDI_MIRROR_DELTA_SHIFT;
     if(delta!=UBIDI_ESC_MIRROR_DELTA) {
         return c+delta;
     } else {
@@ -453,28 +171,25 @@ ubidi_getMirror(const UBiDiProps *bdp, UChar32 c) {
     }
 }
 
-U_CAPI UBool U_EXPORT2
+U_CFUNC UBool
 ubidi_isBidiControl(const UBiDiProps *bdp, UChar32 c) {
-    uint32_t props;
-    GET_PROPS(bdp, c, props);
+    uint16_t props=UTRIE2_GET16(&bdp->trie, c);
     return (UBool)UBIDI_GET_FLAG(props, UBIDI_BIDI_CONTROL_SHIFT);
 }
 
-U_CAPI UBool U_EXPORT2
+U_CFUNC UBool
 ubidi_isJoinControl(const UBiDiProps *bdp, UChar32 c) {
-    uint32_t props;
-    GET_PROPS(bdp, c, props);
+    uint16_t props=UTRIE2_GET16(&bdp->trie, c);
     return (UBool)UBIDI_GET_FLAG(props, UBIDI_JOIN_CONTROL_SHIFT);
 }
 
-U_CAPI UJoiningType U_EXPORT2
+U_CFUNC UJoiningType
 ubidi_getJoiningType(const UBiDiProps *bdp, UChar32 c) {
-    uint32_t props;
-    GET_PROPS(bdp, c, props);
+    uint16_t props=UTRIE2_GET16(&bdp->trie, c);
     return (UJoiningType)((props&UBIDI_JT_MASK)>>UBIDI_JT_SHIFT);
 }
 
-U_CAPI UJoiningGroup U_EXPORT2
+U_CFUNC UJoiningGroup
 ubidi_getJoiningGroup(const UBiDiProps *bdp, UChar32 c) {
     UChar32 start, limit;
 
@@ -489,31 +204,17 @@ ubidi_getJoiningGroup(const UBiDiProps *bdp, UChar32 c) {
 
 /* public API (see uchar.h) ------------------------------------------------- */
 
-U_CAPI UCharDirection U_EXPORT2
+U_CFUNC UCharDirection
 u_charDirection(UChar32 c) {   
-    UErrorCode errorCode=U_ZERO_ERROR;
-    const UBiDiProps *bdp=ubidi_getSingleton(&errorCode);
-    if(bdp!=NULL) {
-        return ubidi_getClass(bdp, c);
-    } else {
-        return U_LEFT_TO_RIGHT;
-    }
+    return ubidi_getClass(&ubidi_props_singleton, c);
 }
 
-U_CAPI UBool U_EXPORT2
+U_CFUNC UBool
 u_isMirrored(UChar32 c) {
-    UErrorCode errorCode=U_ZERO_ERROR;
-    const UBiDiProps *bdp=ubidi_getSingleton(&errorCode);
-    return (UBool)(bdp!=NULL && ubidi_isMirrored(bdp, c));
+    return ubidi_isMirrored(&ubidi_props_singleton, c);
 }
 
-U_CAPI UChar32 U_EXPORT2
+U_CFUNC UChar32
 u_charMirror(UChar32 c) {
-    UErrorCode errorCode=U_ZERO_ERROR;
-    const UBiDiProps *bdp=ubidi_getSingleton(&errorCode);
-    if(bdp!=NULL) {
-        return ubidi_getMirror(bdp, c);
-    } else {
-        return c;
-    }
+    return ubidi_getMirror(&ubidi_props_singleton, c);
 }