Ignore:
Timestamp:
Dec 16, 2017, 12:51:48 PM (13 months ago)
Author:
cameron
Message:

Decouple Unicode property support from re_compiler; initial support for (?-m) flag

File:
1 edited

Legend:

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

    r5785 r5786  
    8484    }
    8585    r = RE_Star_Normal::star_normal(r);
    86    
     86
     87    r = resolveGraphemeMode(r, false /* not in grapheme mode at top level*/);
     88    if (PrintOptions.isSet(ShowAllREs)) {
     89        errs() << "resolveGraphemeMode:\n" << Printer_RE::PrintRE(r) << '\n';
     90    }
     91    r = re::resolveUnicodeProperties(r);
     92    if (PrintOptions.isSet(ShowAllREs) || PrintOptions.isSet(ShowStrippedREs)) {
     93        errs() << "resolveUnicodeProperties:\n" << Printer_RE::PrintRE(r) << '\n';
     94    }
     95
    8796    r = RE_Simplifier::simplify(r);
    8897   
     
    98107    if (PrintOptions.isSet(ShowAllREs)) {
    99108        errs() << "resolveCaseInsensitiveMode:\n" << Printer_RE::PrintRE(r) << '\n';
    100     }
    101     r = resolveGraphemeMode(r, false /* not in grapheme mode at top level*/);
    102     if (PrintOptions.isSet(ShowAllREs)) {
    103         errs() << "resolveGraphemeMode:\n" << Printer_RE::PrintRE(r) << '\n';
    104109    }
    105110    r = re::resolveNames(r);
     
    173178    cc::CC_Compiler cc_compiler(kernel, basis);
    174179    RE_Compiler re_compiler(kernel, cc_compiler);
    175     re_ast = re_compiler.compileUnicodeNames(re_ast);
    176180    return re_compiler.compile(re_ast);
    177181}
Note: See TracChangeset for help on using the changeset viewer.