Ignore:
Timestamp:
Jul 12, 2015, 12:10:59 AM (4 years ago)
Author:
nmedfort
Message:

Moved 'resolveProperties' into CC_NameMap as a single call for each unique Name.

File:
1 edited

Legend:

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

    r4657 r4660  
    2222#include <pablo/codegenstate.h>
    2323#include <pablo/function.h>
    24 #include <resolve_properties.h>
     24#include <UCD/resolve_properties.h>
    2525#include <assert.h>
    2626#include <stdexcept>
     
    252252MarkerType RE_Compiler::process(Name * name, MarkerType marker, PabloBuilder & pb) {
    253253    MarkerType nextPos;
    254     if (markerPos(marker) == FinalPostPositionByte) nextPos = marker;
     254    if (markerPos(marker) == FinalPostPositionByte) {
     255        nextPos = marker;
     256    }
    255257    else if (name->getType() == Name::Type::Byte) {
    256258        nextPos = AdvanceMarker(marker, InitialPostPositionByte, pb);
     
    274276    else if (name->getType() == Name::Type::UnicodeProperty) {
    275277        if (UsePregeneratedUnicode()) {
    276             var = mPB.createCall(name->getName());
     278            var = mPB.createCall(name->getFunctionName());
    277279        }
    278280        else {
     
    287289    return var;
    288290}
    289 
    290291
    291292MarkerType RE_Compiler::process(Seq * seq, MarkerType marker, PabloBuilder & pb) {
Note: See TracChangeset for help on using the changeset viewer.