Changeset 5563


Ignore:
Timestamp:
Jul 12, 2017, 12:50:47 PM (22 months ago)
Author:
cameron
Message:

Fix for longstanding bug plus test case

Location:
icGREP/icgrep-devel
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • icGREP/icgrep-devel/QA/greptest.xml

    r5538 r5563  
    575575<grepcase regexp="ab" datafile="EmptyFile" grepcount="0"/>
    576576<datafile id = "LineBreaking">CRLF1&#13;&#10;CRLF2&#13;&#10;CRLF3&#13;&#10;
    577 LS1&#x2028;LS2&#x2028;LS3&#x2028;PS1&#x2029;PS2&#x2029;PS3&#x2029;
    578 PS4&#x2029;CRLF4&#13;&#10;LS4&#x2028;LS5&#x2028;CRLF5&#13;&#10;LS6&#x2028;
     577LS1&#x2028;LS2&#x2028;LS3&#x2028;PS1&#x2029;PS2&#x2029;PS3&#x2029;&#x2003;
     578PS4&#x2029;CRLF4&#13;&#10;LS4&#x2028;LS5&#x2028;CRLF5&#13;&#10;LS6&#x2028;&#x2003;
    579579Unterminated</datafile>
    580580
     
    586586<grepcase regexp="LS[0-9]*" datafile="LineBreaking" grepcount="6"/>
    587587<grepcase regexp="PS" datafile="LineBreaking" grepcount="4"/>
     588<grepcase regexp="\S" datafile="LineBreaking" grepcount="16"/>
    588589 
    589590<grepcase regexp="[a-z]{20}" datafile="4KiB-onepage" grepcount="77"/>
  • icGREP/icgrep-devel/icgrep/re/re_compiler.cpp

    r5561 r5563  
    7474void RE_Compiler::compile(RE * re) {
    7575    MarkerType match_results = compile(re, mPB);
     76    PabloAST * match_post = markerVar(AdvanceMarker(match_results, MarkerPosition::FinalPostPositionUnit, mPB));
    7677    Var * const output = mKernel->getOutputStreamVar("matches");
    77     mPB.createAssign(mPB.createExtract(output, mPB.getInteger(0)), markerVar(match_results));
     78   
     79    mPB.createAssign(mPB.createExtract(output, mPB.getInteger(0)), match_post);
    7880}
    7981   
Note: See TracChangeset for help on using the changeset viewer.