Changeset 5890
- Timestamp:
- Mar 5, 2018, 9:01:10 AM (12 months ago)
- Location:
- icGREP/icgrep-devel/icgrep
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
icGREP/icgrep-devel/icgrep/kernels/grep_kernel.cpp
r5889 r5890 148 148 // output 149 149 {Binding{kb->getStreamSetTy(1), "nonFinal", FixedRate()}, 150 Binding{kb->getStreamSetTy(1), "UnicodeLB", FixedRate() , Add1()}}) {150 Binding{kb->getStreamSetTy(1), "UnicodeLB", FixedRate()}}) { 151 151 152 152 } … … 308 308 cc::Parabix_CC_Compiler ccc(scope1, basis); 309 309 RE_Compiler re_compiler(scope1, ccc); 310 PabloAST * const matches = re_compiler.compile(mSuffixRE );310 PabloAST * const matches = re_compiler.compile(mSuffixRE, prefixMatches); 311 311 Var * const output = getOutputStreamVar("matches"); 312 312 pb.createAssign(pb.createExtract(output, pb.getInteger(0)), matches); … … 322 322 PabloAST * notLB = pb.createNot(lineBreaks); 323 323 PabloAST * match_follow = pb.createMatchStar(matchResults, notLB); 324 PabloAST * unterminatedLineAtEOF = pb.createAtEOF(pb.createAdvance(notLB, 1), "unterminatedLineAtEOF"); 324 325 Var * const matchedLines = getOutputStreamVar("matchedLines"); 325 pb.createAssign(pb.createExtract(matchedLines, pb.getInteger(0)), pb.createAnd(match_follow, lineBreaks));326 pb.createAssign(pb.createExtract(matchedLines, pb.getInteger(0)), pb.createAnd(match_follow, pb.createOr(lineBreaks, unterminatedLineAtEOF))); 326 327 } 327 328 … … 332 333 ,Binding{iBuilder->getStreamSetTy(1), "lineBreaks"}}, 333 334 // output 334 {Binding{iBuilder->getStreamSetTy(1), "matchedLines" }}) {335 {Binding{iBuilder->getStreamSetTy(1), "matchedLines", FixedRate(), Add1()}}) { 335 336 336 337 } -
icGREP/icgrep-devel/icgrep/re/re_compiler.cpp
r5888 r5890 68 68 pablo::PabloBuilder mPB(mEntryScope); 69 69 const auto markers = initialCursors ? compile(re, initialCursors, mPB) : compile(re, mPB); 70 return markerVar( AdvanceMarker(markers, FinalPostPositionUnit, mPB));70 return markerVar(markers); 71 71 } 72 72 … … 81 81 mCompiledName = &nestedMap; 82 82 auto nested = pb.createScope(); 83 MarkerType m1 = process(re, makeMarker(Final PostPositionUnit, cursors), nested);83 MarkerType m1 = process(re, makeMarker(FinalMatchUnit, cursors), nested); 84 84 nested.createAssign(m, markerVar(m1)); 85 85 pb.createIf(cursors, nested);
Note: See TracChangeset
for help on using the changeset viewer.