Ignore:
Timestamp:
Oct 18, 2015, 8:03:54 AM (4 years ago)
Author:
cameron
Message:

Move genPrintRegister into IDISA builder; fix GCB defs

File:
1 edited

Legend:

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

    r4841 r4843  
    331331    RE * GCB_CR = makeName("gcb", "cr", Name::Type::UnicodeProperty);
    332332    RE * GCB_LF = makeName("gcb", "lf", Name::Type::UnicodeProperty);
     333    RE * GCB_Control_CR_LF = makeAlt({GCB_CR, GCB_LF, GCB_Control});
    333334
    334335    // Break at the start and end of text.
     
    338339    RE * GCB_3 = makeSeq({Behind(GCB_CR), Ahead(GCB_LF)});
    339340    // Otherwise, break before and after controls.
    340     RE * GCB_4 = Behind(GCB_Control);
    341     RE * GCB_5 = Ahead(GCB_Control);
    342     RE * GCB_1_5 = makeAlt({GCB_1, GCB_2, makeDiff(makeSeq({GCB_4, GCB_5}), GCB_3)});
     341    RE * GCB_4 = Behind(GCB_Control_CR_LF);
     342    RE * GCB_5 = Ahead(GCB_Control_CR_LF);
     343    RE * GCB_1_5 = makeAlt({GCB_1, GCB_2, makeDiff(makeAlt({GCB_4, GCB_5}), GCB_3)});
    343344
    344345    RE * GCB_L = makeName("gcb", "l", Name::Type::UnicodeProperty);
Note: See TracChangeset for help on using the changeset viewer.