Changeset 5768

Timestamp:

Dec 9, 2017, 1:37:17 AM (15 months ago)

Author:

cameron

Message:

Regular expression system restructuring progress

Location:

icGREP/icgrep-devel/icgrep

Files:

• grep_engine.cpp (modified) (1 diff)
• kernels/grep_kernel.cpp (modified) (1 diff)
• re/casing.cpp (modified) (1 diff)
• toolchain/grep_pipeline.cpp (modified) (1 diff)

icGREP/icgrep-devel/icgrep/grep_engine.cpp

@@ -125 +125 @@
         doMultiplexCCs(UnicodeSets, exclusiveSetIDs, charclasses[i]);
         REs[i] = multiplex(REs[i], UnicodeSets, exclusiveSetIDs);
-    }
+        REs[i] = regular_expression_passes(REs[i]);
+  }
     
     std::vector<StreamSetBuffer *> MatchResultsBufs(n);

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

@@ -38 +38 @@
 
 RegularExpressionOptimizer::RegularExpressionOptimizer(re::RE * const re_ast)
-: mRE(regular_expression_passes(re_ast))
+: mRE(re_ast)
 , mSignature(Printer_RE::PrintRE(mRE)) {
 

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

@@ -25 +25 @@
         else return re;
     }
-    else if (isa<Name>(re)) {
-        return re;
+    else if (Name * name = dyn_cast<Name>(re)) {
+        if (!inCaseInsensitiveMode || (name->getDefinition() == nullptr)) return re;
+        RE * r = resolveCaseInsensitiveMode(name->getDefinition(), true);
+        Name * n = makeName(name->getNamespace(), name->getName() + "/i", name->getType());
+        n->setDefinition(r);
+        return n;
     }
     else if (Seq * seq = dyn_cast<Seq>(re)) {

icGREP/icgrep-devel/icgrep/toolchain/grep_pipeline.cpp

@@ -38 +38 @@
     const unsigned segmentSize = 8;
 
+    pattern = regular_expression_passes(pattern);
+    
     ParabixDriver pxDriver("codepointEngine");
     auto & idb = pxDriver.getBuilder();