Changeset 5890

Timestamp:

Mar 5, 2018, 9:01:10 AM (14 months ago)

Author:

cameron

Message:

Fixes for byte/bit kernel; match results

Location:

icGREP/icgrep-devel/icgrep

Files:

• kernels/grep_kernel.cpp (modified) (4 diffs)
• re/re_compiler.cpp (modified) (2 diffs)

icGREP/icgrep-devel/icgrep/kernels/grep_kernel.cpp

@@ -148 +148 @@
 // output
 {Binding{kb->getStreamSetTy(1), "nonFinal", FixedRate()},
- Binding{kb->getStreamSetTy(1), "UnicodeLB", FixedRate(), Add1()}}) {
+ Binding{kb->getStreamSetTy(1), "UnicodeLB", FixedRate()}}) {
 
 }
@@ -308 +308 @@
     cc::Parabix_CC_Compiler ccc(scope1, basis);
     RE_Compiler re_compiler(scope1, ccc);
-    PabloAST * const matches = re_compiler.compile(mSuffixRE);
+    PabloAST * const matches = re_compiler.compile(mSuffixRE, prefixMatches);
     Var * const output = getOutputStreamVar("matches");
     pb.createAssign(pb.createExtract(output, pb.getInteger(0)), matches);
@@ -322 +322 @@
     PabloAST * notLB = pb.createNot(lineBreaks);
     PabloAST * match_follow = pb.createMatchStar(matchResults, notLB);
+    PabloAST * unterminatedLineAtEOF = pb.createAtEOF(pb.createAdvance(notLB, 1), "unterminatedLineAtEOF");
     Var * const matchedLines = getOutputStreamVar("matchedLines");
-    pb.createAssign(pb.createExtract(matchedLines, pb.getInteger(0)), pb.createAnd(match_follow, lineBreaks));
+    pb.createAssign(pb.createExtract(matchedLines, pb.getInteger(0)), pb.createAnd(match_follow, pb.createOr(lineBreaks, unterminatedLineAtEOF)));
 }
 
@@ -332 +333 @@
 ,Binding{iBuilder->getStreamSetTy(1), "lineBreaks"}},
 // output
-{Binding{iBuilder->getStreamSetTy(1), "matchedLines"}}) {
+{Binding{iBuilder->getStreamSetTy(1), "matchedLines", FixedRate(), Add1()}}) {
 
 }

icGREP/icgrep-devel/icgrep/re/re_compiler.cpp

@@ -68 +68 @@
     pablo::PabloBuilder mPB(mEntryScope);
     const auto markers = initialCursors ? compile(re, initialCursors, mPB) : compile(re, mPB);
-    return markerVar(AdvanceMarker(markers, FinalPostPositionUnit, mPB));
+    return markerVar(markers);
 }
 
@@ -81 +81 @@
     mCompiledName = &nestedMap;
     auto nested = pb.createScope();
-    MarkerType m1 = process(re, makeMarker(FinalPostPositionUnit, cursors), nested);
+    MarkerType m1 = process(re, makeMarker(FinalMatchUnit, cursors), nested);
     nested.createAssign(m, markerVar(m1));
     pb.createIf(cursors, nested);