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/DerivedCoreProperties.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 {
     
    144144        0xffffffef, 0x0af7fe96, 0xaa96ea84, 0x5ef7f796, 0x0ffffbff,
    145145        0x0ffffbee, 0xffff0000, 0xffff03ff, 0xffff03ff, 0x000003ff,
    146         0x007fffff, 0x001fffff, 0x3fffffff, 0x3fffffff},
    147        34816};
    148     BinaryPropertyObject property_object{Alpha, codepoint_set};
     146        0x007fffff, 0x001fffff, 0x3fffffff, 0x3fffffff}}
     147;
     148    static BinaryPropertyObject property_object{Alpha, codepoint_set};
    149149  }
    150150  namespace CI_ns {
     
    230230        0x001f0000, 0x007f0000, 0x0000000f, 0xffff8000, 0x60000000,
    231231        0x0000000f, 0xfff80380, 0x00000fe7, 0x00003c00, 0x0000001c,
    232         0x007f0000, 0x00000002, 0x0000ffff},
    233        34816};
    234     BinaryPropertyObject property_object{CI, codepoint_set};
     232        0x007f0000, 0x00000002, 0x0000ffff}}
     233;
     234    static BinaryPropertyObject property_object{CI, codepoint_set};
    235235  }
    236236  namespace CWCF_ns {
     
    259259        0x55555555, 0x00042805, 0x55555555, 0x00001555, 0x05555555,
    260260        0x55545554, 0x55555555, 0x6a005555, 0x55452855, 0x00033d55,
    261         0x00f8007f, 0x07fffffe, 0x000000ff},
    262        34816};
    263     BinaryPropertyObject property_object{CWCF, codepoint_set};
     261        0x00f8007f, 0x07fffffe, 0x000000ff}}
     262;
     263    static BinaryPropertyObject property_object{CWCF, codepoint_set};
    264264  }
    265265  namespace CWCM_ns {
     
    288288        0xc06dffff, 0x000c780f, 0x000020bf, 0x00003fff, 0x0fffffff,
    289289        0xfffcfffc, 0xfe00ffff, 0xffcf38ff, 0x00033fff, 0x00f8007f,
    290         0x07fffffe, 0x07fffffe, 0x0000ffff},
    291        34816};
    292     BinaryPropertyObject property_object{CWCM, codepoint_set};
     290        0x07fffffe, 0x07fffffe, 0x0000ffff}}
     291;
     292    static BinaryPropertyObject property_object{CWCM, codepoint_set};
    293293  }
    294294  namespace CWL_ns {
     
    314314        0xc025ea9d, 0x55555555, 0x55555555, 0x55555555, 0x00042805,
    315315        0x55555555, 0x00001555, 0x05555555, 0x55545554, 0x55555555,
    316         0x6a005555, 0x55452855, 0x00033d55, 0x07fffffe, 0x000000ff},
    317        34816};
    318     BinaryPropertyObject property_object{CWL, codepoint_set};
     316        0x6a005555, 0x55452855, 0x00033d55, 0x07fffffe, 0x000000ff}}
     317;
     318    static BinaryPropertyObject property_object{CWL, codepoint_set};
    319319  }
    320320  namespace CWT_ns {
     
    342342        0xaaaaaaaa, 0x0008500a, 0x000020bf, 0xaaaaaaaa, 0x00002aaa,
    343343        0x0aaaaaaa, 0xaaa8aaa8, 0xaaaaaaaa, 0x9400aaaa, 0xaa8a10aa,
    344         0x000002aa, 0x00f8007f, 0x07fffffe, 0xffffff00, 0x0000ffff},
    345        34816};
    346     BinaryPropertyObject property_object{CWT, codepoint_set};
     344        0x000002aa, 0x00f8007f, 0x07fffffe, 0xffffff00, 0x0000ffff}}
     345;
     346    static BinaryPropertyObject property_object{CWT, codepoint_set};
    347347  }
    348348  namespace CWU_ns {
     
    370370        0x0008500a, 0x000020bf, 0xaaaaaaaa, 0x00002aaa, 0x0aaaaaaa,
    371371        0xaaa8aaa8, 0xaaaaaaaa, 0x9400aaaa, 0xaa8a10aa, 0x000002aa,
    372         0x00f8007f, 0x07fffffe, 0xffffff00, 0x0000ffff},
    373        34816};
    374     BinaryPropertyObject property_object{CWU, codepoint_set};
     372        0x00f8007f, 0x07fffffe, 0xffffff00, 0x0000ffff}}
     373;
     374    static BinaryPropertyObject property_object{CWU, codepoint_set};
    375375  }
    376376  namespace CASED_ns {
     
    405405        0xffffff3f, 0xf7fffffd, 0xf7ffffff, 0xffdfffff, 0xffdfffff,
    406406        0xffff7fff, 0xffff7fff, 0xfffffdff, 0xfffffdff, 0x00000ff7,
    407         0xffff0000, 0xffff03ff, 0xffff03ff, 0x000003ff},
    408        34816};
    409     BinaryPropertyObject property_object{Cased, codepoint_set};
     407        0xffff0000, 0xffff03ff, 0xffff03ff, 0x000003ff}}
     408;
     409    static BinaryPropertyObject property_object{Cased, codepoint_set};
    410410  }
    411411  namespace DI_ns {
     
    421421        0x00300000, 0x00007800, 0x0000f800, 0x00007c00, 0x0000ffff,
    422422        0x00000010, 0x0000ffff, 0x80000000, 0x00000001, 0x01ff0000,
    423         0x0000000f, 0x07f80000},
    424        34816};
    425     BinaryPropertyObject property_object{DI, codepoint_set};
     423        0x0000000f, 0x07f80000}}
     424;
     425    static BinaryPropertyObject property_object{DI, codepoint_set};
    426426  }
    427427  namespace GR_BASE_ns {
     
    569569        0xffffffef, 0xffffffe7, 0x0000ffff, 0x000f1fff, 0x000fffff,
    570570        0x001fffff, 0xffff0fff, 0x03ff00ff, 0xffff00ff, 0x00003fff,
    571         0x007fffff, 0x001fffff, 0x3fffffff, 0x3fffffff},
    572        34816};
    573     BinaryPropertyObject property_object{Gr_Base, codepoint_set};
     571        0x007fffff, 0x001fffff, 0x3fffffff, 0x3fffffff}}
     572;
     573    static BinaryPropertyObject property_object{Gr_Base, codepoint_set};
    574574  }
    575575  namespace GR_EXT_ns {
     
    637637        0xb03c8000, 0x00000001, 0xa7f80000, 0x00000001, 0x00bf2800,
    638638        0x001f0000, 0x007f0000, 0x00078000, 0x60000000, 0xf807c3a0,
    639         0x00000fe7, 0x00003c00, 0x0000001c, 0x007f0000, 0x0000ffff},
    640        34816};
    641     BinaryPropertyObject property_object{Gr_Ext, codepoint_set};
     639        0x00000fe7, 0x00003c00, 0x0000001c, 0x007f0000, 0x0000ffff}}
     640;
     641    static BinaryPropertyObject property_object{Gr_Ext, codepoint_set};
    642642  }
    643643  namespace GR_LINK_ns {
     
    666666        0x00400000, 0x00002000, 0x80000000, 0x00000040, 0x80000000,
    667667        0x02000000, 0x00180000, 0x00000001, 0x00200000, 0x00000400,
    668         0x00002000, 0x00000004, 0x80000000, 0x80000000, 0x00400000},
    669        34816};
    670     BinaryPropertyObject property_object{Gr_Link, codepoint_set};
     668        0x00002000, 0x00000004, 0x80000000, 0x80000000, 0x00400000}}
     669;
     670    static BinaryPropertyObject property_object{Gr_Link, codepoint_set};
    671671  }
    672672  namespace IDC_ns {
     
    799799        0xfffffdff, 0xfffffdff, 0xffffcff7, 0x007f001f, 0xffffffef,
    800800        0x0af7fe96, 0xaa96ea84, 0x5ef7f796, 0x0ffffbff, 0x0ffffbee,
    801         0x007fffff, 0x001fffff, 0x3fffffff, 0x3fffffff, 0x0000ffff},
    802        34816};
    803     BinaryPropertyObject property_object{IDC, codepoint_set};
     801        0x007fffff, 0x001fffff, 0x3fffffff, 0x3fffffff, 0x0000ffff}}
     802;
     803    static BinaryPropertyObject property_object{IDC, codepoint_set};
    804804  }
    805805  namespace IDS_ns {
     
    930930        0xfffffdff, 0x00000ff7, 0x0000001f, 0xffffffef, 0x0af7fe96,
    931931        0xaa96ea84, 0x5ef7f796, 0x0ffffbff, 0x0ffffbee, 0x007fffff,
    932         0x001fffff, 0x3fffffff, 0x3fffffff},
    933        34816};
    934     BinaryPropertyObject property_object{IDS, codepoint_set};
     932        0x001fffff, 0x3fffffff, 0x3fffffff}}
     933;
     934    static BinaryPropertyObject property_object{IDS, codepoint_set};
    935935  }
    936936  namespace LOWER_ns {
     
    968968        0x000000ff, 0x0ffffffc, 0xffc00000, 0x0000ffff, 0xfffffc00,
    969969        0x0000003f, 0xf7fffffc, 0xf0000003, 0x0fdfffff, 0xffc00000,
    970         0x003f7fff, 0xffff0000, 0x0000fdff, 0xfffffc00, 0x00000bf7},
    971        34816};
    972     BinaryPropertyObject property_object{Lower, codepoint_set};
     970        0x003f7fff, 0xffff0000, 0x0000fdff, 0xfffffc00, 0x00000bf7}}
     971;
     972    static BinaryPropertyObject property_object{Lower, codepoint_set};
    973973  }
    974974  namespace MATH_ns {
     
    996996        0xdfffffff, 0xebffde64, 0xffffffef, 0xdfdfe7bf, 0x7bffffff,
    997997        0xfffdfc5f, 0xffffff3f, 0xffffcfff, 0xffffffef, 0x0af7fe96,
    998         0xaa96ea84, 0x5ef7f796, 0x0ffffbff, 0x0ffffbee, 0x00030000},
    999        34816};
    1000     BinaryPropertyObject property_object{Math, codepoint_set};
     998        0xaa96ea84, 0x5ef7f796, 0x0ffffbff, 0x0ffffbee, 0x00030000}}
     999;
     1000    static BinaryPropertyObject property_object{Math, codepoint_set};
    10011001  }
    10021002  namespace UPPER_ns {
     
    10311031        0xf0000000, 0x001fffff, 0xffc00000, 0x00007fff, 0xffff0000,
    10321032        0x000001ff, 0x00000400, 0xffff0000, 0xffff03ff, 0xffff03ff,
    1033         0x000003ff},
    1034        34816};
    1035     BinaryPropertyObject property_object{Upper, codepoint_set};
     1033        0x000003ff}}
     1034;
     1035    static BinaryPropertyObject property_object{Upper, codepoint_set};
    10361036  }
    10371037  namespace XIDC_ns {
     
    11661166        0x007f001f, 0xffffffef, 0x0af7fe96, 0xaa96ea84, 0x5ef7f796,
    11671167        0x0ffffbff, 0x0ffffbee, 0x007fffff, 0x001fffff, 0x3fffffff,
    1168         0x3fffffff, 0x0000ffff},
    1169        34816};
    1170     BinaryPropertyObject property_object{XIDC, codepoint_set};
     1168        0x3fffffff, 0x0000ffff}}
     1169;
     1170    static BinaryPropertyObject property_object{XIDC, codepoint_set};
    11711171  }
    11721172  namespace XIDS_ns {
     
    12981298        0x0000001f, 0xffffffef, 0x0af7fe96, 0xaa96ea84, 0x5ef7f796,
    12991299        0x0ffffbff, 0x0ffffbee, 0x007fffff, 0x001fffff, 0x3fffffff,
    1300         0x3fffffff},
    1301        34816};
    1302     BinaryPropertyObject property_object{XIDS, codepoint_set};
     1300        0x3fffffff}}
     1301;
     1302    static BinaryPropertyObject property_object{XIDS, codepoint_set};
    13031303  }
    13041304}
Note: See TracChangeset for help on using the changeset viewer.