Ignore:
Timestamp:
Jun 21, 2015, 4:38:51 PM (4 years ago)
Author:
nmedfort
Message:

Multiplexing bug fix and some CC changes.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • icGREP/icgrep-devel/icgrep/utf8_encoder.cpp

    r4337 r4612  
    5050}
    5151
    52 RE * UTF8_Encoder::rangeToUTF8(const CodePointType lo, const CodePointType hi, const unsigned index, const unsigned max)
     52RE * UTF8_Encoder::rangeToUTF8(const codepoint_t lo, const codepoint_t hi, const unsigned index, const unsigned max)
    5353{
    54     const CodePointType hbyte = u8byte(hi, index);
    55     const CodePointType lbyte = u8byte(lo, index);
     54    const codepoint_t hbyte = u8byte(hi, index);
     55    const codepoint_t lbyte = u8byte(lo, index);
    5656    if (index == max) {
    5757        return makeByteRange(lbyte, hbyte);
     
    8080}
    8181
    82 inline CodePointType UTF8_Encoder::u8byte(const CodePointType codepoint, const unsigned n)
     82inline codepoint_t UTF8_Encoder::u8byte(const codepoint_t codepoint, const unsigned n)
    8383{
    84     CodePointType retVal = 0;
     84    codepoint_t retVal = 0;
    8585
    8686    const unsigned len = lenUTF8(codepoint);
     
    132132}
    133133
    134 inline CC * UTF8_Encoder::makeByteRange(const CodePointType lo, const CodePointType hi) {
     134inline CC * UTF8_Encoder::makeByteRange(const codepoint_t lo, const codepoint_t hi) {
    135135    return makeCC(lo, hi);
    136136}
    137137
    138 inline CC * UTF8_Encoder::makeByteClass(const CodePointType cp) {
     138inline CC * UTF8_Encoder::makeByteClass(const codepoint_t cp) {
    139139    return makeCC(cp, cp);
    140140}
Note: See TracChangeset for help on using the changeset viewer.