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/PropList.h

    r4388 r4618  
    99 */
    1010
     11#include "PropertyAliases.h"
     12#include "unicode_set.h"
    1113#include <vector>
    12 #include "unicode_set.h"
    13 #include "PropertyAliases.h"
    1414
    1515namespace UCD {
     
    1717    const UnicodeSet codepoint_set
    1818      {{{Empty, 1}, {Mixed, 3}, {Empty, 34812}},
    19        {0x03ff0000, 0x0000007e, 0x0000007e},
    20        34816};
    21     BinaryPropertyObject property_object{AHex, codepoint_set};
     19       {0x03ff0000, 0x0000007e, 0x0000007e}}
     20;
     21    static BinaryPropertyObject property_object{AHex, codepoint_set};
    2222  }
    2323  namespace BIDI_C_ns {
     
    2525      {{{Empty, 48}, {Mixed, 1}, {Empty, 207}, {Mixed, 2}, {Empty, 1},
    2626        {Mixed, 1}, {Empty, 34556}},
    27        {0x10000000, 0x0000c000, 0x00007c00, 0x000003c0},
    28        34816};
    29     BinaryPropertyObject property_object{Bidi_C, codepoint_set};
     27       {0x10000000, 0x0000c000, 0x00007c00, 0x000003c0}}
     28;
     29    static BinaryPropertyObject property_object{Bidi_C, codepoint_set};
    3030  }
    3131  namespace DASH_ns {
     
    3939        0x003f0000, 0x00080000, 0x08000000, 0x00000800, 0x00040000,
    4040        0x04800000, 0x0c000000, 0x00000001, 0x10000000, 0x00010000,
    41         0x00000001, 0x00060000, 0x01000000, 0x00000008, 0x00002000},
    42        34816};
    43     BinaryPropertyObject property_object{Dash, codepoint_set};
     41        0x00000001, 0x00060000, 0x01000000, 0x00000008, 0x00002000}}
     42;
     43    static BinaryPropertyObject property_object{Dash, codepoint_set};
    4444  }
    4545  namespace DEP_ns {
     
    5050        {Empty, 6140}},
    5151       {0x00000200, 0x00080000, 0x02800000, 0x00000018, 0x0000fc00,
    52         0x00000600, 0x00000002},
    53        34816};
    54     BinaryPropertyObject property_object{Dep, codepoint_set};
     52        0x00000600, 0x00000002}}
     53;
     54    static BinaryPropertyObject property_object{Dep, codepoint_set};
    5555  }
    5656  namespace DIA_ns {
     
    112112        0x10000000, 0x00002000, 0x001f1fc0, 0x0000000c, 0x80000000,
    113113        0x00000001, 0x80000000, 0x00c00000, 0x001f0000, 0xffff8000,
    114         0xf807e380, 0x00000fe7, 0x00003c00, 0x007f0000},
    115        34816};
    116     BinaryPropertyObject property_object{Dia, codepoint_set};
     114        0xf807e380, 0x00000fe7, 0x00003c00, 0x007f0000}}
     115;
     116    static BinaryPropertyObject property_object{Dia, codepoint_set};
    117117  }
    118118  namespace EXT_ns {
     
    133133        0x00200000, 0x00001000, 0x00008000, 0x00000040, 0x00010000,
    134134        0x20000000, 0x00180000, 0x00010000, 0x20000000, 0x000001c0,
    135         0x0000000c},
    136        34816};
    137     BinaryPropertyObject property_object{Ext, codepoint_set};
     135        0x0000000c}}
     136;
     137    static BinaryPropertyObject property_object{Ext, codepoint_set};
    138138  }
    139139  namespace HEX_ns {
     
    141141      {{{Empty, 1}, {Mixed, 3}, {Empty, 2036}, {Mixed, 3}, {Empty, 32773}},
    142142       {0x03ff0000, 0x0000007e, 0x0000007e, 0x03ff0000, 0x0000007e,
    143         0x0000007e},
    144        34816};
    145     BinaryPropertyObject property_object{Hex, codepoint_set};
     143        0x0000007e}}
     144;
     145    static BinaryPropertyObject property_object{Hex, codepoint_set};
    146146  }
    147147  namespace HYPHEN_ns {
     
    153153        {Empty, 32772}},
    154154       {0x00002000, 0x00002000, 0x00000400, 0x00000040, 0x00030000,
    155         0x00800000, 0x08000000, 0x00000008, 0x00002000, 0x00000020},
    156        34816};
    157     BinaryPropertyObject property_object{Hyphen, codepoint_set};
     155        0x00800000, 0x08000000, 0x00000008, 0x00002000, 0x00000020}}
     156;
     157    static BinaryPropertyObject property_object{Hyphen, codepoint_set};
    158158  }
    159159  namespace IDSB_ns {
    160160    const UnicodeSet codepoint_set
    161161      {{{Empty, 383}, {Mixed, 1}, {Empty, 34432}},
    162        {0x0ff30000},
    163        34816};
    164     BinaryPropertyObject property_object{IDSB, codepoint_set};
     162       {0x0ff30000}}
     163;
     164    static BinaryPropertyObject property_object{IDSB, codepoint_set};
    165165  }
    166166  namespace IDST_ns {
    167167    const UnicodeSet codepoint_set
    168168      {{{Empty, 383}, {Mixed, 1}, {Empty, 34432}},
    169        {0x000c0000},
    170        34816};
    171     BinaryPropertyObject property_object{IDST, codepoint_set};
     169       {0x000c0000}}
     170;
     171    static BinaryPropertyObject property_object{IDST, codepoint_set};
    172172  }
    173173  namespace IDEO_ns {
     
    179179        {Mixed, 1}, {Empty, 511}, {Full, 16}, {Mixed, 1}, {Empty, 28719}},
    180180       {0x000000c0, 0x070003fe, 0x003fffff, 0x00001fff, 0xffff3fff,
    181         0x03ffffff, 0x007fffff, 0x001fffff, 0x3fffffff, 0x3fffffff},
    182        34816};
    183     BinaryPropertyObject property_object{Ideo, codepoint_set};
     181        0x03ffffff, 0x007fffff, 0x001fffff, 0x3fffffff, 0x3fffffff}}
     182;
     183    static BinaryPropertyObject property_object{Ideo, codepoint_set};
    184184  }
    185185  namespace JOIN_C_ns {
    186186    const UnicodeSet codepoint_set
    187187      {{{Empty, 256}, {Mixed, 1}, {Empty, 34559}},
    188        {0x00003000},
    189        34816};
    190     BinaryPropertyObject property_object{Join_C, codepoint_set};
     188       {0x00003000}}
     189;
     190    static BinaryPropertyObject property_object{Join_C, codepoint_set};
    191191  }
    192192  namespace LOE_ns {
     
    194194      {{{Empty, 114}, {Mixed, 1}, {Empty, 3}, {Mixed, 1}, {Empty, 1246},
    195195        {Mixed, 1}, {Empty, 33450}},
    196        {0x0000001f, 0x0000001f, 0x1a600000},
    197        34816};
    198     BinaryPropertyObject property_object{LOE, codepoint_set};
     196       {0x0000001f, 0x0000001f, 0x1a600000}}
     197;
     198    static BinaryPropertyObject property_object{LOE, codepoint_set};
    199199  }
    200200  namespace NCHAR_ns {
     
    211211        0xc0000000, 0xc0000000, 0xc0000000, 0xc0000000, 0xc0000000,
    212212        0xc0000000, 0xc0000000, 0xc0000000, 0xc0000000, 0xc0000000,
    213         0xc0000000, 0xc0000000, 0xc0000000, 0xc0000000},
    214        34816};
    215     BinaryPropertyObject property_object{NChar, codepoint_set};
     213        0xc0000000, 0xc0000000, 0xc0000000, 0xc0000000}}
     214;
     215    static BinaryPropertyObject property_object{NChar, codepoint_set};
    216216  }
    217217  namespace OALPHA_ns {
     
    267267        0x7fff0000, 0x00000001, 0x003ff800, 0x007f0000, 0xfffe0000,
    268268        0x7fffffff, 0x40000000, 0xffff0000, 0xffff03ff, 0xffff03ff,
    269         0x000003ff},
    270        34816};
    271     BinaryPropertyObject property_object{OAlpha, codepoint_set};
     269        0x000003ff}}
     270;
     271    static BinaryPropertyObject property_object{OAlpha, codepoint_set};
    272272  }
    273273  namespace ODI_ns {
     
    279279        {Full, 112}, {Empty, 6016}},
    280280       {0x00008000, 0x80000000, 0x00000001, 0x00300000, 0x00000020,
    281         0x00000010, 0x00000001, 0x01ff0000, 0xfffffffd, 0xffff0000},
    282        34816};
    283     BinaryPropertyObject property_object{ODI, codepoint_set};
     281        0x00000010, 0x00000001, 0x01ff0000, 0xfffffffd, 0xffff0000}}
     282;
     283    static BinaryPropertyObject property_object{ODI, codepoint_set};
    284284  }
    285285  namespace OGR_EXT_ns {
     
    294294        0x00800000, 0x00600004, 0x40000000, 0x00800000, 0x80008000,
    295295        0x00003000, 0x0000c000, 0xc0000000, 0x40000000, 0x00800000,
    296         0x20010000, 0x00008000, 0x0007c020},
    297        34816};
    298     BinaryPropertyObject property_object{OGr_Ext, codepoint_set};
     296        0x20010000, 0x00008000, 0x0007c020}}
     297;
     298    static BinaryPropertyObject property_object{OGr_Ext, codepoint_set};
    299299  }
    300300  namespace OIDC_ns {
     
    302302      {{{Empty, 5}, {Mixed, 1}, {Empty, 22}, {Mixed, 1}, {Empty, 126},
    303303        {Mixed, 1}, {Empty, 50}, {Mixed, 1}, {Empty, 34609}},
    304        {0x00800000, 0x00000080, 0x0003fe00, 0x04000000},
    305        34816};
    306     BinaryPropertyObject property_object{OIDC, codepoint_set};
     304       {0x00800000, 0x00000080, 0x0003fe00, 0x04000000}}
     305;
     306    static BinaryPropertyObject property_object{OIDC, codepoint_set};
    307307  }
    308308  namespace OIDS_ns {
    309309    const UnicodeSet codepoint_set
    310310      {{{Empty, 264}, {Mixed, 2}, {Empty, 122}, {Mixed, 1}, {Empty, 34427}},
    311        {0x01000000, 0x00004000, 0x18000000},
    312        34816};
    313     BinaryPropertyObject property_object{OIDS, codepoint_set};
     311       {0x01000000, 0x00004000, 0x18000000}}
     312;
     313    static BinaryPropertyObject property_object{OIDS, codepoint_set};
    314314  }
    315315  namespace OLOWER_ns {
     
    324324        0x04000000, 0xfffff000, 0x010007ff, 0xf8000000, 0x80020000,
    325325        0x1fff0000, 0xffff0000, 0xffff0000, 0x000003ff, 0x30000000,
    326         0x30000000, 0x00010000, 0x03000000, 0xf0000000},
    327        34816};
    328     BinaryPropertyObject property_object{OLower, codepoint_set};
     326        0x30000000, 0x00010000, 0x03000000, 0xf0000000}}
     327;
     328    static BinaryPropertyObject property_object{OLower, codepoint_set};
    329329  }
    330330  namespace OMATH_ns {
     
    350350        0xffdfffff, 0xffff7fff, 0xffff7fff, 0xfffffdff, 0xfffffdff,
    351351        0xffffcff7, 0xffffffef, 0x0af7fe96, 0xaa96ea84, 0x5ef7f796,
    352         0x0ffffbff, 0x0ffffbee},
    353        34816};
    354     BinaryPropertyObject property_object{OMath, codepoint_set};
     352        0x0ffffbff, 0x0ffffbee}}
     353;
     354    static BinaryPropertyObject property_object{OMath, codepoint_set};
    355355  }
    356356  namespace OUPPER_ns {
     
    359359        {Mixed, 4}, {Empty, 30835}},
    360360       {0x0000ffff, 0xffc00000, 0x0000ffff, 0xffff0000, 0xffff03ff,
    361         0xffff03ff, 0x000003ff},
    362        34816};
    363     BinaryPropertyObject property_object{OUpper, codepoint_set};
     361        0xffff03ff, 0x000003ff}}
     362;
     363    static BinaryPropertyObject property_object{OUpper, codepoint_set};
    364364  }
    365365  namespace PAT_SYN_ns {
     
    373373        0x00800000, 0xffff0000, 0x7fff00ff, 0x7feffffe, 0xffff0000,
    374374        0x003fffff, 0xfff00000, 0xffffff0e, 0x00010001, 0xc0000000,
    375         0x00000060},
    376        34816};
    377     BinaryPropertyObject property_object{Pat_Syn, codepoint_set};
     375        0x00000060}}
     376;
     377    static BinaryPropertyObject property_object{Pat_Syn, codepoint_set};
    378378  }
    379379  namespace PAT_WS_ns {
     
    381381      {{{Mixed, 2}, {Empty, 2}, {Mixed, 1}, {Empty, 251}, {Mixed, 2},
    382382        {Empty, 34558}},
    383        {0x00003e00, 0x00000001, 0x00000020, 0x0000c000, 0x00000300},
    384        34816};
    385     BinaryPropertyObject property_object{Pat_WS, codepoint_set};
     383       {0x00003e00, 0x00000001, 0x00000020, 0x0000c000, 0x00000300}}
     384;
     385    static BinaryPropertyObject property_object{Pat_WS, codepoint_set};
    386386  }
    387387  namespace QMARK_ns {
     
    392392        {Mixed, 1}, {Empty, 32772}},
    393393       {0x00000084, 0x08000800, 0xff000000, 0x06000000, 0x00000004,
    394         0xe000f000, 0x0000001e, 0x00000084, 0x0000000c},
    395        34816};
    396     BinaryPropertyObject property_object{QMark, codepoint_set};
     394        0xe000f000, 0x0000001e, 0x00000084, 0x0000000c}}
     395;
     396    static BinaryPropertyObject property_object{QMark, codepoint_set};
    397397  }
    398398  namespace RADICAL_ns {
     
    400400      {{{Empty, 372}, {Mixed, 1}, {Full, 2}, {Mixed, 1}, {Full, 6},
    401401        {Mixed, 1}, {Empty, 34433}},
    402        {0xfbffffff, 0x000fffff, 0x003fffff},
    403        34816};
    404     BinaryPropertyObject property_object{Radical, codepoint_set};
     402       {0xfbffffff, 0x000fffff, 0x003fffff}}
     403;
     404    static BinaryPropertyObject property_object{Radical, codepoint_set};
    405405  }
    406406  namespace SD_ns {
     
    419419        0x10000000, 0x0000000c, 0x00c00000, 0x00000c00, 0xc0000000,
    420420        0x000c0000, 0x000000c0, 0x0c000000, 0x0000c000, 0x0000000c,
    421         0x00c00000, 0x00000c00, 0xc0000000, 0x000c0000},
    422        34816};
    423     BinaryPropertyObject property_object{SD, codepoint_set};
     421        0x00c00000, 0x00000c00, 0xc0000000, 0x000c0000}}
     422;
     423    static BinaryPropertyObject property_object{SD, codepoint_set};
    424424  }
    425425  namespace STERM_ns {
     
    453453        0x00000180, 0xc0000000, 0x00000003, 0x0000000e, 0x00002060,
    454454        0x1b000000, 0x0000020c, 0x00000006, 0x0000c000, 0x00200000,
    455         0x01800000, 0x00000010, 0x80000000},
    456        34816};
    457     BinaryPropertyObject property_object{STerm, codepoint_set};
     455        0x01800000, 0x00000010, 0x80000000}}
     456;
     457    static BinaryPropertyObject property_object{STerm, codepoint_set};
    458458  }
    459459  namespace TERM_ns {
     
    497497        0x00000003, 0x0000000e, 0x00002060, 0x1f000000, 0x0000023c,
    498498        0x00000006, 0x001f0000, 0x0000c000, 0x00200000, 0x03800000,
    499         0x00000010, 0x80000000},
    500        34816};
    501     BinaryPropertyObject property_object{Term, codepoint_set};
     499        0x00000010, 0x80000000}}
     500;
     501    static BinaryPropertyObject property_object{Term, codepoint_set};
    502502  }
    503503  namespace UIDEO_ns {
     
    508508        {Mixed, 1}, {Empty, 29247}},
    509509       {0x003fffff, 0x00001fff, 0x801ac000, 0x0000039a, 0x007fffff,
    510         0x001fffff, 0x3fffffff},
    511        34816};
    512     BinaryPropertyObject property_object{UIdeo, codepoint_set};
     510        0x001fffff, 0x3fffffff}}
     511;
     512    static BinaryPropertyObject property_object{UIdeo, codepoint_set};
    513513  }
    514514  namespace VS_ns {
     
    516516      {{{Empty, 192}, {Mixed, 1}, {Empty, 1839}, {Mixed, 1}, {Empty, 26647},
    517517        {Full, 7}, {Mixed, 1}, {Empty, 6128}},
    518        {0x00003800, 0x0000ffff, 0x0000ffff},
    519        34816};
    520     BinaryPropertyObject property_object{VS, codepoint_set};
     518       {0x00003800, 0x0000ffff, 0x0000ffff}}
     519;
     520    static BinaryPropertyObject property_object{VS, codepoint_set};
    521521  }
    522522  namespace WSPACE_ns {
     
    525525        {Empty, 75}, {Mixed, 3}, {Empty, 125}, {Mixed, 1}, {Empty, 34431}},
    526526       {0x00003e00, 0x00000001, 0x00000020, 0x00000001, 0x00000001,
    527         0x000007ff, 0x00008300, 0x80000000, 0x00000001},
    528        34816};
    529     BinaryPropertyObject property_object{WSpace, codepoint_set};
     527        0x000007ff, 0x00008300, 0x80000000, 0x00000001}}
     528;
     529    static BinaryPropertyObject property_object{WSpace, codepoint_set};
    530530  }
    531531}
Note: See TracChangeset for help on using the changeset viewer.