Ignore:
Timestamp:
Oct 17, 2015, 4:25:05 PM (4 years ago)
Author:
nmedfort
Message:

Update for grapheme cluster mode and boundaries.

File:
1 edited

Legend:

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

    r4405 r4841  
    11#include "re_simplifier.h"
    2 #include "re_cc.h"
    3 #include "re_name.h"
    4 #include "re_start.h"
    5 #include "re_end.h"
    6 #include "re_seq.h"
    7 #include "re_alt.h"
    8 #include "re_rep.h"
    9 #include "re_diff.h"
    10 #include "re_intersect.h"
    11 #include "re_assertion.h"
     2#include <re/re_name.h>
     3#include <re/re_any.h>
     4#include <re/re_start.h>
     5#include <re/re_end.h>
     6#include <re/re_alt.h>
     7#include <re/re_cc.h>
     8#include <re/re_seq.h>
     9#include <re/re_rep.h>
     10#include <re/re_diff.h>
     11#include <re/re_intersect.h>
     12#include <re/re_assertion.h>
     13#include <re/re_grapheme_boundary.hpp>
    1214#include <algorithm>
    1315#include <memory>
     
    2426        }
    2527        re = makeAlt(list.begin(), list.end());
    26     }
    27     else if (Seq * seq = dyn_cast<Seq>(re)) {
     28    } else if (Seq * seq = dyn_cast<Seq>(re)) {
    2829        std::vector<RE*> list;
    2930        list.reserve(seq->size());
     
    3233        }
    3334        re = makeSeq(list.begin(), list.end());
    34     }
    35     else if (Assertion * a = dyn_cast<Assertion>(re)) {
     35    } else if (Assertion * a = dyn_cast<Assertion>(re)) {
    3636        re = makeAssertion(simplify(a->getAsserted()), a->getKind(), a->getSense());
    37     }
    38     else if (Rep * rep = dyn_cast<Rep>(re)) {
     37    } else if (Rep * rep = dyn_cast<Rep>(re)) {
    3938        re = makeRep(simplify(rep->getRE()), rep->getLB(), rep->getUB());
    40     }
    41     else if (Diff * diff = dyn_cast<Diff>(re)) {
     39    } else if (Diff * diff = dyn_cast<Diff>(re)) {
    4240        re = makeDiff(simplify(diff->getLH()), diff->getRH());
    43     }
    44     else if (Intersect * e = dyn_cast<Intersect>(re)) {
     41    } else if (Intersect * e = dyn_cast<Intersect>(re)) {
    4542        re = makeIntersect(simplify(e->getLH()), e->getRH());
    4643    }
Note: See TracChangeset for help on using the changeset viewer.