Ignore:
Timestamp:
Oct 1, 2015, 2:54:17 PM (4 years ago)
Author:
nmedfort
Message:

Embedded UnicodeSet? into CC objects (will currently cause memory leak)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • icGREP/icgrep-devel/icgrep/re/re_parser.cpp

    r4809 r4812  
    475475    // It is an error if a 4-byte sequence is used to encode a codepoint
    476476    // above the Unicode maximum.
    477     if (cp > CC::UNICODE_MAX) {
     477    if (cp > UCD::UNICODE_MAX) {
    478478        throw InvalidUTF8Encoding();
    479479    }
     
    929929    }
    930930    if (count < mindigits) throw ParseFailure("Octal sequence has too few digits");
    931     if (value > CC::UNICODE_MAX) throw ParseFailure("Octal value too large");
     931    if (value > UCD::UNICODE_MAX) throw ParseFailure("Octal value too large");
    932932    return value;
    933933}
     
    948948    }
    949949    if (count < mindigits) throw ParseFailure("Hexadecimal sequence has too few digits");
    950     if (value > CC::UNICODE_MAX) throw ParseFailure("Hexadecimal value too large");
     950    if (value > UCD::UNICODE_MAX) throw ParseFailure("Hexadecimal value too large");
    951951    return value;
    952952}
     
    966966    if (fModeFlagSet & CASE_INSENSITIVE_MODE_FLAG) {
    967967        caseInsensitiveInsert(cc, cp);
    968     }
    969     else cc->insert(cp);
     968    } else {
     969        cc->insert(cp);
     970    }
    970971}
    971972
     
    973974    if (fModeFlagSet & CASE_INSENSITIVE_MODE_FLAG) {
    974975        caseInsensitiveInsertRange(cc, lo, hi);
    975     }
    976     else cc->insert_range(lo, hi);
     976    } else {
     977        cc->insert_range(lo, hi);
     978    }
    977979}
    978980
Note: See TracChangeset for help on using the changeset viewer.