Ignore:
Timestamp:
Jul 16, 2015, 3:46:58 PM (4 years ago)
Author:
nmedfort
Message:

First attempt to add arguments to Call objects. Currently non-functioning in Pablo_Compiler.

File:
1 edited

Legend:

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

    r4680 r4681  
    4949}
    5050
    51 RE_Compiler::RE_Compiler(cc::CC_Compiler & ccCompiler)
     51RE_Compiler::RE_Compiler(pablo::PabloFunction & function, cc::CC_Compiler & ccCompiler)
    5252: mCCCompiler(ccCompiler)
    5353, mLineFeed(nullptr)
     
    6262, mPB(*ccCompiler.getBuilder().getPabloBlock(), ccCompiler.getBuilder())
    6363, mUCDCompiler(ccCompiler)
     64, mFunction(function)
    6465{
    6566
     
    175176}
    176177
    177 void RE_Compiler::finalizeMatchResult(PabloFunction & function, MarkerType match_result) {
     178void RE_Compiler::finalizeMatchResult(MarkerType match_result) {
    178179    //These three lines are specifically for grep.
    179180    PabloAST * lb = UNICODE_LINE_BREAK ? mUnicodeLineBreak : mLineFeed;
    180181    PabloAST * v = markerVar(match_result);
    181     function.setResult(0, mPB.createAssign("matches", mPB.createAnd(mPB.createMatchStar(v, mPB.createNot(lb)), lb)));
    182     function.setResult(1, mPB.createAssign("lf", mPB.createAnd(lb, mPB.createNot(mCRLF))));
     182    mFunction.setResult(0, mPB.createAssign("matches", mPB.createAnd(mPB.createMatchStar(v, mPB.createNot(lb)), lb)));
     183    mFunction.setResult(1, mPB.createAssign("lf", mPB.createAnd(lb, mPB.createNot(mCRLF))));
    183184}
    184185
     
    275276    else if (name->getType() == Name::Type::UnicodeProperty) {
    276277        if (UsePregeneratedUnicode()) {
    277             var = pb.createCall(Prototype::Create(name->getFunctionName(), 8, 1, 0));
     278            var = pb.createCall(Prototype::Create(name->getFunctionName(), 8, 1, 0), mCCCompiler.getBasisBits());
    278279        }
    279280        else {
Note: See TracChangeset for help on using the changeset viewer.