Ignore:
Timestamp:
May 24, 2017, 10:42:09 AM (2 years ago)
Author:
cameron
Message:

Initial support for -q, -l, -L modes, grep options reorganization

Location:
icGREP/icgrep-devel/icgrep/re
Files:
3 edited

Legend:

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

    r5464 r5473  
    643643RE * RE_Parser::parseRegexPropertyValue(const std::string & propName, const std::string& regexValue) {
    644644    RE * propValueRe = RE_Parser::parse("^" + regexValue + "$", fModeFlagSet, mReSyntax);
    645     GrepEngine engine;
    646     engine.grepCodeGen({ propValueRe }, false, false, GrepSource::Internal, GrepType::PropertyValue);
     645    grep::GrepEngine engine;
     646    engine.grepCodeGen({ propValueRe }, grep::NormalMode, false, GrepSource::Internal, GrepType::PropertyValue);
    647647    const auto matches = engine.grepPropertyValues(propName);
    648648    if (matches.empty()) {
     
    676676    RE * embedded = makeSeq({mMemoizer.memoize(makeCC(0x3B)), makeRep(makeAny(), 0, Rep::UNBOUNDED_REP), nameRE});
    677677   
    678     GrepEngine engine;
    679     engine.grepCodeGen({ embedded }, false, false, GrepSource::Internal, GrepType::NameExpression);
     678    grep::GrepEngine engine;
     679    engine.grepCodeGen({ embedded }, grep::NormalMode, false, GrepSource::Internal, GrepType::NameExpression);
    680680    CC * codepoints = engine.grepCodepoints();
    681681   
  • icGREP/icgrep-devel/icgrep/re/re_toolchain.cpp

    r5413 r5473  
    3838                              clEnumVal(DisableUnicodeMatchStar, "disable Unicode MatchStar optimization"),
    3939                              clEnumVal(DisableUnicodeLineBreak, "disable Unicode line breaks - use LF only"),
    40                               clEnumValN(InvertMatches, "v", "select non-matching lines"),
    4140                              clEnumValEnd),
    4241                   cl::cat(RegexOptions));
  • icGREP/icgrep-devel/icgrep/re/re_toolchain.h

    r5413 r5473  
    2020enum RE_AlgorithmFlags {
    2121    DisableLog2BoundedRepetition, DisableIfHierarchy, DisableMatchStar, DisableUnicodeMatchStar,
    22     DisableUnicodeLineBreak, InvertMatches, UsePregeneratedUnicode
     22    DisableUnicodeLineBreak, UsePregeneratedUnicode
    2323};
    2424   
Note: See TracChangeset for help on using the changeset viewer.