Ignore:
Timestamp:
Dec 21, 2017, 3:22:41 PM (15 months ago)
Author:
cameron
Message:

Adding Alphabet to CCs: initial check-in

File:
1 edited

Legend:

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

    r5792 r5795  
    2222#include <re/exclude_CC.h>
    2323#include <re/re_name_resolve.h>
    24 #include <re/re_collect_unicodesets.h>
    25 #include <re/re_multiplex.h>
    2624#include <re/grapheme_clusters.h>
    27 #include <cc/multiplex_CCs.h>
    2825#include <llvm/Support/raw_ostream.h>
    2926
     
    6562
    6663
    67 std::pair<RE *, std::vector<re::CC *>> multiplexing_passes(RE * r) {
     64RE * multiplexing_prepasses(RE * r) {
    6865    std::vector<re::CC *> charclasses;
    6966    if (PrintOptions.isSet(ShowAllREs) || PrintOptions.isSet(ShowREs)) {
     
    116113        errs() << "exclude_CC:\n" << Printer_RE::PrintRE(r) << '\n';
    117114    }
    118     const auto UnicodeSets = re::collectUnicodeSets(r);
    119     std::vector<std::vector<unsigned>> exclusiveSetIDs;
    120     doMultiplexCCs(UnicodeSets, exclusiveSetIDs, charclasses);
    121     r = multiplex(r, UnicodeSets, exclusiveSetIDs);
    122     if (PrintOptions.isSet(ShowAllREs)) {
    123         errs() << "multiplex:\n" << Printer_RE::PrintRE(r) << '\n';
    124     }
    125     return std::pair<RE *, std::vector<re::CC *>>(r, charclasses);
     115    return r;
    126116}
    127117
Note: See TracChangeset for help on using the changeset viewer.