Ignore:
Timestamp:
Jun 28, 2015, 3:55:39 PM (4 years ago)
Author:
nmedfort
Message:

Bug fix for CC insert_range and UnicodeSet? iterator.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • icGREP/icgrep-devel/icgrep/UCD/DerivedGeneralCategory.h

    r4618 r4621  
    159159        0xfff00000, 0xffe00000, 0x0000f000, 0xfc00ff00, 0x0000ff00,
    160160        0xffffc000, 0xff800000, 0xffe00000, 0xc0000000, 0xc0000000,
    161         0xffff0000}}
    162 ;
     161        0xffff0000}};
    163162    const UnicodeSet cc_Set
    164163      {{{Full, 1}, {Empty, 2}, {Mixed, 1}, {Full, 1}, {Empty, 34811}},
    165        {0x80000000}}
    166 ;
     164       {0x80000000}};
    167165    const UnicodeSet cf_Set
    168166      {{{Empty, 5}, {Mixed, 1}, {Empty, 42}, {Mixed, 1}, {Empty, 5},
     
    174172       {0x00002000, 0x1000003f, 0x20000000, 0x00008000, 0x00004000,
    175173        0x0000f800, 0x00007c00, 0x0000ffdf, 0x80000000, 0x0e000000,
    176         0x20000000, 0x0000000f, 0x07f80000, 0x00000002}}
    177 ;
     174        0x20000000, 0x0000000f, 0x07f80000, 0x00000002}};
    178175    const UnicodeSet cn_Set
    179176      {{{Empty, 27}, {Mixed, 3}, {Empty, 11}, {Mixed, 4}, {Empty, 1},
     
    318315        0xffe00000, 0x0000f000, 0xfc00ff00, 0x0000ff00, 0xffffc000,
    319316        0xff800000, 0xffe00000, 0xc0000000, 0xc0000000, 0xfffffffd,
    320         0xffff0000, 0xc0000000, 0xc0000000}}
    321 ;
     317        0xffff0000, 0xc0000000, 0xc0000000}};
    322318    const UnicodeSet co_Set
    323319      {{{Empty, 1792}, {Full, 200}, {Empty, 28728}, {Full, 2047},
    324320        {Mixed, 1}, {Full, 2047}, {Mixed, 1}},
    325        {0x3fffffff, 0x3fffffff}}
    326 ;
     321       {0x3fffffff, 0x3fffffff}};
    327322    const UnicodeSet cs_Set
    328323      {{{Empty, 1728}, {Full, 64}, {Empty, 33024}},
    329        {}}
    330 ;
     324       {}};
    331325    const UnicodeSet l_Set
    332326      {{{Empty, 2}, {Mixed, 2}, {Empty, 1}, {Mixed, 3}, {Full, 14},
     
    454448        0x00000ff7, 0x0000001f, 0xffffffef, 0x0af7fe96, 0xaa96ea84,
    455449        0x5ef7f796, 0x0ffffbff, 0x0ffffbee, 0x007fffff, 0x001fffff,
    456         0x3fffffff, 0x3fffffff}}
    457 ;
     450        0x3fffffff, 0x3fffffff}};
    458451    const UnicodeSet lc_Set
    459452      {{{Empty, 2}, {Mixed, 2}, {Empty, 1}, {Mixed, 3}, {Full, 5},
     
    484477        0xdfdfe7bf, 0x7bffffff, 0xfffdfc5f, 0xffffff3f, 0xf7fffffd,
    485478        0xf7ffffff, 0xffdfffff, 0xffdfffff, 0xffff7fff, 0xffff7fff,
    486         0xfffffdff, 0xfffffdff, 0x00000ff7}}
    487 ;
     479        0xfffffdff, 0xfffffdff, 0x00000ff7}};
    488480    const UnicodeSet ll_Set
    489481      {{{Empty, 3}, {Mixed, 1}, {Empty, 1}, {Mixed, 14}, {Full, 1},
     
    518510        0x000000ff, 0x0ffffffc, 0xffc00000, 0x0000ffff, 0xfffffc00,
    519511        0x0000003f, 0xf7fffffc, 0xf0000003, 0x0fdfffff, 0xffc00000,
    520         0x003f7fff, 0xffff0000, 0x0000fdff, 0xfffffc00, 0x00000bf7}}
    521 ;
     512        0x003f7fff, 0xffff0000, 0x0000fdff, 0xfffffc00, 0x00000bf7}};
    522513    const UnicodeSet lm_Set
    523514      {{{Empty, 21}, {Mixed, 3}, {Empty, 3}, {Mixed, 1}, {Empty, 14},
     
    546537        0xff800000, 0x00010000, 0x00000100, 0x03000000, 0x00008000,
    547538        0x00000040, 0x00010000, 0x20000000, 0x00180000, 0xf0000000,
    548         0x00010000, 0xc0000000, 0x0000000f, 0xfff80000}}
    549 ;
     539        0x00010000, 0xc0000000, 0x0000000f, 0xfff80000}};
    550540    const UnicodeSet lo_Set
    551541      {{{Empty, 5}, {Mixed, 1}, {Empty, 7}, {Mixed, 2}, {Empty, 5},
     
    655645        0x1fff07ff, 0x03ff01ff, 0x0000001f, 0xffffffef, 0x0af7fe96,
    656646        0xaa96ea84, 0x5ef7f796, 0x0ffffbff, 0x0ffffbee, 0x007fffff,
    657         0x001fffff, 0x3fffffff, 0x3fffffff}}
    658 ;
     647        0x001fffff, 0x3fffffff, 0x3fffffff}};
    659648    const UnicodeSet lt_Set
    660649      {{{Empty, 14}, {Mixed, 2}, {Empty, 236}, {Mixed, 4}, {Empty, 34560}},
    661650       {0x00000920, 0x00040000, 0xff00ff00, 0x1000ff00, 0x00001000,
    662         0x10000000}}
    663 ;
     651        0x10000000}};
    664652    const UnicodeSet lu_Set
    665653      {{{Empty, 2}, {Mixed, 1}, {Empty, 3}, {Mixed, 1}, {Empty, 1},
     
    690678        0xf0000003, 0x003fffff, 0xffff0000, 0x000003ff, 0xffffff00,
    691679        0x00000001, 0x07fffffc, 0xf0000000, 0x001fffff, 0xffc00000,
    692         0x00007fff, 0xffff0000, 0x000001ff, 0x00000400}}
    693 ;
     680        0x00007fff, 0xffff0000, 0x000001ff, 0x00000400}};
    694681    const UnicodeSet m_Set
    695682      {{{Empty, 24}, {Full, 3}, {Mixed, 1}, {Empty, 8}, {Mixed, 1},
     
    756743        0x00fff800, 0x001f0000, 0x007f0000, 0xfffe0000, 0x7fffffff,
    757744        0x00078000, 0x60000000, 0xf807e3e0, 0x00000fe7, 0x00003c00,
    758         0x0000001c, 0x007f0000, 0x0000ffff}}
    759 ;
     745        0x0000001c, 0x007f0000, 0x0000ffff}};
    760746    const UnicodeSet mc_Set
    761747      {{{Empty, 72}, {Mixed, 3}, {Empty, 1}, {Mixed, 3}, {Empty, 1},
     
    794780        0x00000001, 0x002c7000, 0x00000007, 0x0000000c, 0xc0000000,
    795781        0x0080399e, 0x0000000c, 0x7a070000, 0x00000002, 0x4f038000,
    796         0x58070000, 0x0040d000, 0xfffe0000, 0x7fffffff, 0x0007e060}}
    797 ;
     782        0x58070000, 0x0040d000, 0xfffe0000, 0x7fffffff, 0x0007e060}};
    798783    const UnicodeSet me_Set
    799784      {{{Empty, 36}, {Mixed, 1}, {Empty, 176}, {Mixed, 1}, {Empty, 48},
    800785        {Mixed, 2}, {Empty, 1067}, {Mixed, 1}, {Empty, 33484}},
    801        {0x00000300, 0x40000000, 0xe0000000, 0x0000001d, 0x00070000}}
    802 ;
     786       {0x00000300, 0x40000000, 0xe0000000, 0x0000001d, 0x00070000}};
    803787    const UnicodeSet mn_Set
    804788      {{{Empty, 24}, {Full, 3}, {Mixed, 1}, {Empty, 8}, {Mixed, 1},
     
    864848        0x00bf2800, 0x001f0000, 0x007f0000, 0x00078000, 0x60000000,
    865849        0xf8000380, 0x00000fe7, 0x00003c00, 0x0000001c, 0x007f0000,
    866         0x0000ffff}}
    867 ;
     850        0x0000ffff}};
    868851    const UnicodeSet n_Set
    869852      {{{Empty, 1}, {Mixed, 1}, {Empty, 3}, {Mixed, 1}, {Empty, 45},
     
    919902        0x03ff0000, 0x000003ff, 0x0007ffff, 0x00007fff, 0x000003ff,
    920903        0xfbff0000, 0x00000003, 0x0003ffff, 0xffffc000, 0x0000ff80,
    921         0x00001fff}}
    922 ;
     904        0x00001fff}};
    923905    const UnicodeSet nd_Set
    924906      {{{Empty, 1}, {Mixed, 1}, {Empty, 49}, {Mixed, 1}, {Empty, 3},
     
    950932        0x000003ff, 0x0000ffc0, 0x03ff0000, 0xffc00000, 0x03ff0000,
    951933        0x03ff0000, 0x03ff0000, 0x03ff0000, 0x000003ff, 0x000003ff,
    952         0x000003ff, 0x03ff0000, 0xffffc000}}
    953 ;
     934        0x000003ff, 0x03ff0000, 0xffffc000}};
    954935    const UnicodeSet nl_Set
    955936      {{{Empty, 183}, {Mixed, 1}, {Empty, 83}, {Full, 1}, {Mixed, 1},
     
    958939        {Mixed, 1}, {Empty, 257}, {Full, 3}, {Mixed, 1}, {Empty, 32476}},
    959940       {0x0001c000, 0x000001e7, 0x00000080, 0x070003fe, 0x0000ffc0,
    960         0x001fffff, 0x00000402, 0x003e0000, 0x00007fff}}
    961 ;
     941        0x001fffff, 0x00000402, 0x003e0000, 0x00007fff}};
    962942    const UnicodeSet no_Set
    963943      {{{Empty, 5}, {Mixed, 1}, {Empty, 73}, {Mixed, 1}, {Empty, 11},
     
    988968        0xff000000, 0x0000fe00, 0x7fffffff, 0xfffc0000, 0x0000003f,
    989969        0x001ffffe, 0x0007fc00, 0xf8000000, 0x00000003, 0x0003ffff,
    990         0x0000ff80, 0x00001fff}}
    991 ;
     970        0x0000ff80, 0x00001fff}};
    992971    const UnicodeSet p_Set
    993972      {{{Empty, 1}, {Mixed, 3}, {Empty, 1}, {Mixed, 1}, {Empty, 21},
     
    10481027        0x00300000, 0x000021e0, 0x3f000000, 0x00000040, 0x000003fe,
    10491028        0x0000000e, 0x001f0000, 0x0000c000, 0x00200000, 0x0f800000,
    1050         0x00000010, 0x80000000}}
    1051 ;
     1029        0x00000010, 0x80000000}};
    10521030    const UnicodeSet pc_Set
    10531031      {{{Empty, 2}, {Mixed, 1}, {Empty, 254}, {Mixed, 2}, {Empty, 1774},
    10541032        {Mixed, 2}, {Empty, 6}, {Mixed, 1}, {Empty, 32774}},
    10551033       {0x80000000, 0x80000000, 0x00100001, 0x00180000, 0x0000e000,
    1056         0x80000000}}
    1057 ;
     1034        0x80000000}};
    10581035    const UnicodeSet pd_Set
    10591036      {{{Empty, 1}, {Mixed, 1}, {Empty, 42}, {Mixed, 2}, {Empty, 114},
     
    10651042        0x003f0000, 0x04800000, 0x0c000000, 0x00000001, 0x10000000,
    10661043        0x00010000, 0x00000001, 0x00060000, 0x01000000, 0x00000008,
    1067         0x00002000}}
    1068 ;
     1044        0x00002000}};
    10691045    const UnicodeSet pe_Set
    10701046      {{{Empty, 1}, {Mixed, 3}, {Empty, 117}, {Mixed, 1}, {Empty, 58},
     
    10791055        0x20000000, 0x000002a8, 0xcaa2aa00, 0x40000000, 0x01000000,
    10801056        0x55400000, 0x54000115, 0x00000200, 0x20000000, 0x20000000,
    1081         0x00000009}}
    1082 ;
     1057        0x00000009}};
    10831058    const UnicodeSet pf_Set
    10841059      {{{Empty, 5}, {Mixed, 1}, {Empty, 250}, {Mixed, 2}, {Empty, 110},
    10851060        {Mixed, 2}, {Empty, 34446}},
    1086        {0x08000000, 0x22000000, 0x04000000, 0x20002428, 0x00000002}}
    1087 ;
     1061       {0x08000000, 0x22000000, 0x04000000, 0x20002428, 0x00000002}};
    10881062    const UnicodeSet pi_Set
    10891063      {{{Empty, 5}, {Mixed, 1}, {Empty, 250}, {Mixed, 2}, {Empty, 110},
    10901064        {Mixed, 2}, {Empty, 34446}},
    1091        {0x00000800, 0x99000000, 0x02000000, 0x10001214, 0x00000001}}
    1092 ;
     1065       {0x00000800, 0x99000000, 0x02000000, 0x10001214, 0x00000001}};
    10931066    const UnicodeSet po_Set
    10941067      {{{Empty, 1}, {Mixed, 2}, {Empty, 2}, {Mixed, 1}, {Empty, 21},
     
    11421115        0xd8000000, 0x00000003, 0x0000000f, 0x00300000, 0x000021e0,
    11431116        0x3f000000, 0x00000040, 0x000003fe, 0x0000000e, 0x001f0000,
    1144         0x0000c000, 0x00200000, 0x0f800000, 0x00000010, 0x80000000}}
    1145 ;
     1117        0x0000c000, 0x00200000, 0x0f800000, 0x00000010, 0x80000000}};
    11461118    const UnicodeSet ps_Set
    11471119      {{{Empty, 1}, {Mixed, 3}, {Empty, 117}, {Mixed, 1}, {Empty, 58},
     
    11571129        0x05000000, 0x10000000, 0x00000154, 0x00000004, 0x25515500,
    11581130        0x80000000, 0x00800000, 0xaaa00000, 0x2a00008a, 0x00000100,
    1159         0x08000000, 0x88000000, 0x00000004}}
    1160 ;
     1131        0x08000000, 0x88000000, 0x00000004}};
    11611132    const UnicodeSet s_Set
    11621133      {{{Empty, 1}, {Mixed, 3}, {Empty, 1}, {Mixed, 3}, {Empty, 14},
     
    12281199        0xfff07fff, 0x00ffffff, 0x7fffffff, 0xffff07ff, 0xfbffffff,
    12291200        0xffffffef, 0xffffffe7, 0x0000ffff, 0x000f1fff, 0x000fffff,
    1230         0x001fffff, 0xffff0fff, 0x03ff00ff, 0xffff00ff, 0x00003fff}}
    1231 ;
     1201        0x001fffff, 0xffff0fff, 0x03ff00ff, 0xffff00ff, 0x00003fff}};
    12321202    const UnicodeSet sc_Set
    12331203      {{{Empty, 1}, {Mixed, 1}, {Empty, 3}, {Mixed, 1}, {Empty, 38},
     
    12401210       {0x00000010, 0x0000003c, 0x00008000, 0x00000800, 0x080c0000,
    12411211        0x00020000, 0x02000000, 0x80000000, 0x08000000, 0x3fffffff,
    1242         0x01000000, 0x10000000, 0x00000200, 0x00000010, 0x00000063}}
    1243 ;
     1212        0x01000000, 0x10000000, 0x00000200, 0x00000010, 0x00000063}};
    12441213    const UnicodeSet sk_Set
    12451214      {{{Empty, 2}, {Mixed, 2}, {Empty, 1}, {Mixed, 1}, {Empty, 16},
     
    12511220        0x00200000, 0x00000030, 0xa0000000, 0xe000e003, 0x6000e000,
    12521221        0x18000000, 0x007fffff, 0x00000003, 0x00000600, 0x08000000,
    1253         0xfffc0000, 0x00000003, 0x40000000, 0x00000001, 0x00000008}}
    1254 ;
     1222        0xfffc0000, 0x00000003, 0x40000000, 0x00000001, 0x00000008}};
    12551223    const UnicodeSet sm_Set
    12561224      {{{Empty, 1}, {Mixed, 1}, {Empty, 1}, {Mixed, 1}, {Empty, 1},
     
    12741242        0x70000800, 0x50000000, 0x00001e04, 0x08000002, 0x08000000,
    12751243        0x00200000, 0x00200000, 0x00008000, 0x00008000, 0x00000200,
    1276         0x00000200, 0x00000008, 0x00030000}}
    1277 ;
     1244        0x00000200, 0x00000008, 0x00030000}};
    12781245    const UnicodeSet so_Set
    12791246      {{{Empty, 5}, {Mixed, 1}, {Empty, 30}, {Mixed, 1}, {Empty, 7},
     
    13321299        0xfbffffff, 0xffffffef, 0xffffffe7, 0x0000ffff, 0x000f1fff,
    13331300        0x000fffff, 0x001fffff, 0xffff0fff, 0x03ff00ff, 0xffff00ff,
    1334         0x00003fff}}
    1335 ;
     1301        0x00003fff}};
    13361302    const UnicodeSet z_Set
    13371303      {{{Empty, 1}, {Mixed, 1}, {Empty, 3}, {Mixed, 1}, {Empty, 174},
     
    13391305        {Empty, 34431}},
    13401306       {0x00000001, 0x00000001, 0x00000001, 0x000007ff, 0x00008300,
    1341         0x80000000, 0x00000001}}
    1342 ;
     1307        0x80000000, 0x00000001}};
    13431308    const UnicodeSet zl_Set
    13441309      {{{Empty, 257}, {Mixed, 1}, {Empty, 34558}},
    1345        {0x00000100}}
    1346 ;
     1310       {0x00000100}};
    13471311    const UnicodeSet zp_Set
    13481312      {{{Empty, 257}, {Mixed, 1}, {Empty, 34558}},
    1349        {0x00000200}}
    1350 ;
     1313       {0x00000200}};
    13511314    const UnicodeSet zs_Set
    13521315      {{{Empty, 1}, {Mixed, 1}, {Empty, 3}, {Mixed, 1}, {Empty, 174},
     
    13541317        {Empty, 34431}},
    13551318       {0x00000001, 0x00000001, 0x00000001, 0x000007ff, 0x00008000,
    1356         0x80000000, 0x00000001}}
    1357 ;
     1319        0x80000000, 0x00000001}};
    13581320    static EnumeratedPropertyObject property_object
    13591321      {gc,
Note: See TracChangeset for help on using the changeset viewer.