Ignore:
Timestamp:
Feb 8, 2018, 9:32:11 PM (16 months ago)
Author:
cameron
Message:

Fold UnicodeLineBreak? into Required_Streams_UTF8; CRLF into nonFinal

File:
1 edited

Legend:

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

    r5863 r5867  
    2121#include <re/re_intersect.h>        // for Intersect
    2222#include <re/re_name.h>             // for Name, Name::Type, Name::Type::Zer...
    23 #include <re/re_name_resolve.h>     // for resolveNames
    24 #include <re/re_name_gather.h>      // for gatherNames
    2523#include <re/re_rep.h>              // for Rep, Rep::::UNBOUNDED_REP
    2624#include <re/re_seq.h>              // for Seq
     
    556554inline MarkerType RE_Compiler::compileEnd(MarkerType marker, pablo::PabloBuilder & pb) {
    557555    PabloAST * const nextPos = markerVar(AdvanceMarker(marker, FinalPostPositionUnit, pb));
    558     PabloAST * const atEOL = pb.createOr(pb.createAnd(mLineBreak, nextPos), pb.createAdvance(pb.createAnd(nextPos, mCRLF), 1), "eol");
     556    PabloAST * const atEOL = pb.createAnd(mLineBreak, nextPos, "eol");
     557    //PabloAST * const atEOL = pb.createOr(pb.createAnd(mLineBreak, nextPos), pb.createAdvance(pb.createAnd(nextPos, mCRLF), 1), "eol");
    559558    return makeMarker(FinalPostPositionUnit, atEOL);
    560559}
     
    590589, mCCCompiler(ccCompiler)
    591590, mLineBreak(nullptr)
    592 , mCRLF(nullptr)
    593591, mNonFinal(nullptr)
    594592, mFinal(nullptr)
     
    599597    Var * const linebreak = mKernel->getInputStreamVar("linebreak");
    600598    mLineBreak = mPB.createExtract(linebreak, 0);
    601     Var * const crlf = mKernel->getInputStreamVar("cr+lf");
    602     mCRLF = mPB.createExtract(crlf, 0);
    603599    Var * const required = mKernel->getInputStreamVar("required");
    604600    mNonFinal = mPB.createExtract(required, 0);
Note: See TracChangeset for help on using the changeset viewer.