Ignore:
Timestamp:
Jun 26, 2015, 3:27:40 PM (4 years ago)
Author:
nmedfort
Message:

More modifications to UnicodeSet? class.

File:
1 edited

Legend:

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

    r4388 r4618  
    99 */
    1010
    11 #include <vector>
     11#include "PropertyObjects.h"
     12#include "PropertyValueAliases.h"
    1213#include "unicode_set.h"
    13 #include "PropertyAliases.h"
    14 #include "PropertyValueAliases.h"
    1514
    1615namespace UCD {
     
    4039        0xffffff0b, 0x20000000, 0x00800000, 0xffc00000, 0x03e00000,
    4140        0x0000ff00, 0x0000ffff, 0x20000000, 0xffff07ff, 0xffff3fff,
    42         0xffff03ff, 0x07ffffff, 0x0000ffff, 0x3fffffff, 0x3fffffff},
    43        34816};
     41        0xffff03ff, 0x07ffffff, 0x0000ffff, 0x3fffffff, 0x3fffffff}}
     42;
    4443    const UnicodeSet f_Set
    4544      {{{Empty, 384}, {Mixed, 1}, {Empty, 1655}, {Mixed, 1}, {Full, 2},
    4645        {Mixed, 1}, {Empty, 3}, {Mixed, 1}, {Empty, 32768}},
    47        {0x00000001, 0xfffffffe, 0x00000001, 0x0000007f},
    48        34816};
     46       {0x00000001, 0xfffffffe, 0x00000001, 0x0000007f}}
     47;
    4948    const UnicodeSet h_Set
    5049      {{{Empty, 261}, {Mixed, 1}, {Empty, 1781}, {Mixed, 1}, {Full, 1},
    5150        {Mixed, 3}, {Empty, 32768}},
    52        {0x00000200, 0xfffffffe, 0x7fffffff, 0x1cfcfcfc, 0x00007f00},
    53        34816};
     51       {0x00000200, 0xfffffffe, 0x7fffffff, 0x1cfcfcfc, 0x00007f00}}
     52;
    5453    const UnicodeSet n_Set
    5554      {{{Full, 1}, {Empty, 2}, {Mixed, 1}, {Full, 1}, {Mixed, 7}, {Full, 2},
     
    9291        0xfffffffc, 0x0000f800, 0x0000c000, 0x0000fc00, 0xf8000000,
    9392        0x0000fff8, 0xf8000000, 0xfffcfe00, 0xc0000000, 0xc0000000,
    94         0xffff0000, 0xc0000000, 0xc0000000},
    95        34816};
     93        0xffff0000, 0xc0000000, 0xc0000000}}
     94;
    9695    const UnicodeSet na_Set
    9796      {{{Empty, 1}, {Full, 2}, {Mixed, 1}, {Empty, 1}, {Mixed, 1},
    9897        {Empty, 313}, {Mixed, 1}, {Empty, 12}, {Mixed, 1}, {Empty, 34483}},
    99        {0x7fffffff, 0x0000906c, 0x00003fc0, 0x00000060},
    100        34816};
     98       {0x7fffffff, 0x0000906c, 0x00003fc0, 0x00000060}}
     99;
    101100    const UnicodeSet w_Set
    102101      {{{Empty, 136}, {Full, 3}, {Empty, 142}, {Mixed, 1}, {Empty, 90},
     
    115114        0x0000000f, 0x03ff0000, 0xffff0000, 0xfff7ffff, 0x00000f7f,
    116115        0x00000003, 0xffff0007, 0x07ffffff, 0x000301ff, 0x3fffffff,
    117         0x3fffffff},
    118        34816};
    119     EnumeratedPropertyObject property_object
     116        0x3fffffff}}
     117;
     118    static EnumeratedPropertyObject property_object
    120119      {ea,
    121120       EA_ns::enum_names,
Note: See TracChangeset for help on using the changeset viewer.