Ignore:
Timestamp:
Jun 29, 2015, 3:53:32 PM (4 years ago)
Author:
nmedfort
Message:

Temporary check-in

Location:
icGREP/icgrep-devel/icgrep/UCD
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • icGREP/icgrep-devel/icgrep/UCD/ucd_compiler.cpp

    r4622 r4623  
    11#include "ucd_compiler.hpp"
     2#include <cc/cc_compiler.h>
     3#include <UCD/unicode_set.h>
    24#include <utf8_encoder.h>
    35
     
    1416 * @return the output stream with a 1-bit in any position of a character in the unicode set
    1517 ** ------------------------------------------------------------------------------------------------------------- */
    16 inline PabloAST * UCDCompiler::generateWithIfHierarchy(const RangeList & ifRanges, const UnicodeSet & set, PabloBuilder & entry) {
     18PabloAST * UCDCompiler::generateWithIfHierarchy(const RangeList & ifRanges, const UnicodeSet & set, PabloBuilder & entry) {
    1719    return generateWithIfHierarchy(ifRanges, set, 0, CC::UNICODE_MAX, entry);
    1820}
     
    328330 * @return the output stream with a 1-bit in any position of a character in the unicode set
    329331 ** ------------------------------------------------------------------------------------------------------------- */
    330 inline PabloAST * UCDCompiler::generateWithDefaultIfHierarchy(const UnicodeSet & set, PabloBuilder & entry) {
    331 
    332     const RangeList ifRanges = {
     332PabloAST * UCDCompiler::generateWithDefaultIfHierarchy(const UnicodeSet & set, PabloBuilder & entry) {
     333
     334    const RangeList defaultIfHierachy = {
    333335        // Non-ASCII
    334336        {0x80, 0x10FFFF},
     
    417419        {0x10000, 0x10FFFF}};
    418420
    419     return generateWithIfHierarchy(ifRanges, set, entry);
     421    return generateWithIfHierarchy(defaultIfHierachy, set, entry);
    420422}
    421423
  • icGREP/icgrep-devel/icgrep/UCD/ucd_compiler.hpp

    r4622 r4623  
    33
    44#include <vector>
    5 #include <cc/cc_compiler.h>
    65#include <re/re_cc.h>
    7 #include <UCD/unicode_set.h>
    8 #include <unordered_map>
    96
    10 class Encoding;
     7namespace cc {
     8    class CC_Compiler;
     9}
     10
     11namespace pablo {
     12    class PabloBuilder;
     13    class PabloAST;
     14}
    1115
    1216namespace UCD {
     17
     18class UnicodeSet;
    1319
    1420class UCDCompiler {
     
    3844
    3945    PabloAST * ifTestCompiler(const codepoint_t lo, const codepoint_t hi, PabloBuilder & block);
     46
    4047    PabloAST * ifTestCompiler(const codepoint_t lo, const codepoint_t hi, const unsigned byte_no, PabloBuilder & block, PabloAST * target);
    4148
Note: See TracChangeset for help on using the changeset viewer.