Changeset 5768 for icGREP/icgrep-devel


Ignore:
Timestamp:
Dec 9, 2017, 1:37:17 AM (18 months ago)
Author:
cameron
Message:

Regular expression system restructuring progress

Location:
icGREP/icgrep-devel/icgrep
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • icGREP/icgrep-devel/icgrep/grep_engine.cpp

    r5762 r5768  
    125125        doMultiplexCCs(UnicodeSets, exclusiveSetIDs, charclasses[i]);
    126126        REs[i] = multiplex(REs[i], UnicodeSets, exclusiveSetIDs);
    127     }
     127        REs[i] = regular_expression_passes(REs[i]);
     128  }
    128129   
    129130    std::vector<StreamSetBuffer *> MatchResultsBufs(n);
  • icGREP/icgrep-devel/icgrep/kernels/grep_kernel.cpp

    r5706 r5768  
    3838
    3939RegularExpressionOptimizer::RegularExpressionOptimizer(re::RE * const re_ast)
    40 : mRE(regular_expression_passes(re_ast))
     40: mRE(re_ast)
    4141, mSignature(Printer_RE::PrintRE(mRE)) {
    4242
  • icGREP/icgrep-devel/icgrep/re/casing.cpp

    r5766 r5768  
    2525        else return re;
    2626    }
    27     else if (isa<Name>(re)) {
    28         return re;
     27    else if (Name * name = dyn_cast<Name>(re)) {
     28        if (!inCaseInsensitiveMode || (name->getDefinition() == nullptr)) return re;
     29        RE * r = resolveCaseInsensitiveMode(name->getDefinition(), true);
     30        Name * n = makeName(name->getNamespace(), name->getName() + "/i", name->getType());
     31        n->setDefinition(r);
     32        return n;
    2933    }
    3034    else if (Seq * seq = dyn_cast<Seq>(re)) {
  • icGREP/icgrep-devel/icgrep/toolchain/grep_pipeline.cpp

    r5755 r5768  
    3838    const unsigned segmentSize = 8;
    3939
     40    pattern = regular_expression_passes(pattern);
     41   
    4042    ParabixDriver pxDriver("codepointEngine");
    4143    auto & idb = pxDriver.getBuilder();
Note: See TracChangeset for help on using the changeset viewer.