Ignore:
Timestamp:
Jul 16, 2015, 1:51:51 PM (4 years ago)
Author:
nmedfort
Message:

Added pablo Prototype to compiler. All Calls must be given one instead of a Name.

File:
1 edited

Legend:

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

    r4673 r4680  
    2121#include <cc/cc_namemap.hpp>
    2222#include <pablo/codegenstate.h>
    23 #include <pablo/function.h>
    2423#include <UCD/resolve_properties.h>
    2524#include <assert.h>
     
    179178    //These three lines are specifically for grep.
    180179    PabloAST * lb = UNICODE_LINE_BREAK ? mUnicodeLineBreak : mLineFeed;
    181     PabloAST * v = markerVar(match_result);   
    182     function.addResult(mPB.createAssign("matches", mPB.createAnd(mPB.createMatchStar(v, mPB.createNot(lb)), lb)));
    183     function.addResult(mPB.createAssign("lf", mPB.createAnd(lb, mPB.createNot(mCRLF))));
     180    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))));
    184183}
    185184
     
    276275    else if (name->getType() == Name::Type::UnicodeProperty) {
    277276        if (UsePregeneratedUnicode()) {
    278             var = mPB.createCall(name->getFunctionName());
     277            var = pb.createCall(Prototype::Create(name->getFunctionName(), 8, 1, 0));
    279278        }
    280279        else {
Note: See TracChangeset for help on using the changeset viewer.