Ignore:
Timestamp:
Jan 25, 2018, 2:03:09 PM (15 months ago)
Author:
cameron
Message:

CC Compiler refactoring step

File:
1 edited

Legend:

Unmodified
Added
Removed
  • icGREP/icgrep-devel/icgrep/kernels/grep_kernel.cpp

    r5842 r5843  
    4242void RequiredStreams_UTF8::generatePabloMethod() {
    4343    PabloBuilder pb(getEntryScope());
    44     cc::CC_Compiler ccc(this, getInput(0));
     44    cc::CC_Compiler ccc(this, getInputStreamSet("basis"));
    4545    Zeroes * const ZEROES = pb.createZeroes();
    4646    PabloAST * const u8pfx = ccc.compileCC(makeByte(0xC0, 0xFF));
     
    135135void RequiredStreams_UTF16::generatePabloMethod() {
    136136    PabloBuilder pb(getEntryScope());
    137     cc::CC_Compiler ccc(this, getInput(0));
     137    cc::CC_Compiler ccc(this, getInputStreamSet("basis"));
    138138   
    139139    PabloAST * u16hi_hi_surrogate = ccc.compileCC(makeCC(0xD800, 0xDBFF, &cc::UTF16));    //u16hi_hi_surrogate = [\xD8-\xDB]
     
    208208void ICGrepKernel::generatePabloMethod() {
    209209    PabloBuilder pb(getEntryScope());
    210     Var * const basis = getInputStreamVar("basis");
    211     cc::CC_Compiler cc_compiler(this, basis);
     210    cc::CC_Compiler cc_compiler(this, getInputStreamSet("basis"));
    212211    RE_Compiler re_compiler(this, cc_compiler);
    213212    for (auto a : mAlphabets) {
    214         auto basis = getInputStreamVar(a->getName() + "_basis");
    215         re_compiler.addAlphabet(a, basis);
     213        auto mpx_basis = getInputStreamSet(a->getName() + "_basis");
     214        re_compiler.addAlphabet(a, mpx_basis);
    216215    }
    217216    PabloAST * const matches = re_compiler.compile(mRE);
Note: See TracChangeset for help on using the changeset viewer.