Changeset 5808


Ignore:
Timestamp:
Dec 26, 2017, 9:09:20 AM (11 months ago)
Author:
cameron
Message:

Fix for CRLF issue

File:
1 edited

Legend:

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

    r5802 r5808  
    538538inline MarkerType RE_Compiler::compileEnd(MarkerType marker, pablo::PabloBuilder & pb) {
    539539    PabloAST * const nextPos = markerVar(AdvanceMarker(marker, MarkerPosition::FinalPostPositionUnit, pb));
    540     return makeMarker(MarkerPosition::FinalPostPositionUnit, pb.createAnd(pb.createScanThru(nextPos, mCRLF), mLineBreak, "eol"));
     540    PabloAST * atEOL = pb.createOr(pb.createAnd(mLineBreak, nextPos), pb.createAdvance(pb.createAnd(nextPos, mCRLF), 1), "eol");
     541    return makeMarker(MarkerPosition::FinalPostPositionUnit, atEOL);
    541542}
    542543
Note: See TracChangeset for help on using the changeset viewer.