Update ICU to 54.1 step 1

source/common/ubidi_props.c

 /*
 *******************************************************************************
 *
-*   Copyright (C) 2004-2013, International Business Machines
+*   Copyright (C) 2004-2014, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *
 *******************************************************************************
 *   file name:  ubidi_props.c
 *   encoding:   US-ASCII
 *   tab size:   8 (not used)
 *   indentation:4
 *
 *   created on: 2004dec30
 *   created by: Markus W. Scherer
@@ skipping 10 matching lines @@
 #include "cmemory.h"
 #include "utrie2.h"
 #include "ubidi_props.h"
 #include "ucln_cmn.h"
 
 struct UBiDiProps {
     UDataMemory *mem;
     const int32_t *indexes;
     const uint32_t *mirrors;
     const uint8_t *jgArray;
+    const uint8_t *jgArray2;
 
     UTrie2 trie;
     uint8_t formatVersion[4];
 };
 
 /* ubidi_props_data.h is machine-generated by genbidi --csource */
 #define INCLUDED_FROM_UBIDI_PROPS_C
 #include "ubidi_props_data.h"
 
 /* UBiDiProps singleton ----------------------------------------------------- */
@@ skipping 32 matching lines @@
     length=bdp->indexes[UBIDI_IX_MIRROR_LENGTH];
     for(i=0; i<length; ++i) {
         c=UBIDI_GET_MIRROR_CODE_POINT(bdp->mirrors[i]);
         sa->addRange(sa->set, c, c+1);
     }
 
     /* add the code points from the Joining_Group array where the value changes */
     start=bdp->indexes[UBIDI_IX_JG_START];
     limit=bdp->indexes[UBIDI_IX_JG_LIMIT];
     jgArray=bdp->jgArray;
-    prev=0;
-    while(start<limit) {
-        jg=*jgArray++;
-        if(jg!=prev) {
-            sa->add(sa->set, start);
-            prev=jg;
+    for(;;) {
+        prev=0;
+        while(start<limit) {
+            jg=*jgArray++;
+            if(jg!=prev) {
+                sa->add(sa->set, start);
+                prev=jg;
+            }
+            ++start;
         }
-        ++start;
-    }
-    if(prev!=0) {
-        /* add the limit code point if the last value was not 0 (it is now start==limit) */
-        sa->add(sa->set, limit);
+        if(prev!=0) {
+            /* add the limit code point if the last value was not 0 (it is now start==limit) */
+            sa->add(sa->set, limit);
+        }
+        if(limit==bdp->indexes[UBIDI_IX_JG_LIMIT]) {
+            /* switch to the second Joining_Group range */
+            start=bdp->indexes[UBIDI_IX_JG_START2];
+            limit=bdp->indexes[UBIDI_IX_JG_LIMIT2];
+            jgArray=bdp->jgArray2;
+        } else {
+            break;
+        }
     }
 
     /* add code points with hardcoded properties, plus the ones following them */
 
     /* (none right now) */
 }
 
 /* property access functions ------------------------------------------------ */
 
 U_CFUNC int32_t
@@ skipping 88 matching lines @@
 }
 
 U_CFUNC UJoiningGroup
 ubidi_getJoiningGroup(const UBiDiProps *bdp, UChar32 c) {
     UChar32 start, limit;
 
     start=bdp->indexes[UBIDI_IX_JG_START];
     limit=bdp->indexes[UBIDI_IX_JG_LIMIT];
     if(start<=c && c<limit) {
         return (UJoiningGroup)bdp->jgArray[c-start];
-    } else {
-        return U_JG_NO_JOINING_GROUP;
     }
+    start=bdp->indexes[UBIDI_IX_JG_START2];
+    limit=bdp->indexes[UBIDI_IX_JG_LIMIT2];
+    if(start<=c && c<limit) {
+        return (UJoiningGroup)bdp->jgArray2[c-start];
+    }
+    return U_JG_NO_JOINING_GROUP;
 }
 
 U_CFUNC UBidiPairedBracketType
 ubidi_getPairedBracketType(const UBiDiProps *bdp, UChar32 c) {
     uint16_t props=UTRIE2_GET16(&bdp->trie, c);
     return (UBidiPairedBracketType)((props&UBIDI_BPT_MASK)>>UBIDI_BPT_SHIFT);
 }
 
 U_CFUNC UChar32
 ubidi_getPairedBracket(const UBiDiProps *bdp, UChar32 c) {
@@ skipping 19 matching lines @@
 
 U_CFUNC UChar32
 u_charMirror(UChar32 c) {
     return ubidi_getMirror(&ubidi_props_singleton, c);
 }
 
 U_STABLE UChar32 U_EXPORT2
 u_getBidiPairedBracket(UChar32 c) {
     return ubidi_getPairedBracket(&ubidi_props_singleton, c);
 }