Changeset 5888 for icGREP


Ignore:
Timestamp:
Mar 4, 2018, 9:38:52 AM (11 months ago)
Author:
cameron
Message:

Allow RE compilers to be associated with any Pablo block, not just kernel entry

Location:
icGREP/icgrep-devel/icgrep
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • icGREP/icgrep-devel/icgrep/kernels/grapheme_kernel.cpp

    r5887 r5888  
    3333    cc::Parabix_CC_Compiler ccc(getEntryScope(), getInputStreamSet("basis"));
    3434    UCD::UCDCompiler ucdCompiler(ccc);
    35     re::RE_Compiler re_compiler(this, ccc);
     35    re::RE_Compiler re_compiler(getEntryScope(), ccc);
    3636    re::RE * GCB = re::generateGraphemeClusterBoundaryRule();
    3737    std::set<re::Name *> externals;
  • icGREP/icgrep-devel/icgrep/kernels/grep_kernel.cpp

    r5881 r5888  
    227227    PabloBuilder pb(getEntryScope());
    228228    cc::Parabix_CC_Compiler ccc(getEntryScope(), getInputStreamSet("basis"));
    229     RE_Compiler re_compiler(this, ccc);
     229    RE_Compiler re_compiler(getEntryScope(), ccc);
    230230    for (auto & e : mExternals) {
    231231        re_compiler.addPrecompiled(e, pb.createExtract(getInputStreamVar(e), pb.getInteger(0)));
  • icGREP/icgrep-devel/icgrep/re/re_compiler.cpp

    r5881 r5888  
    599599}
    600600
    601 RE_Compiler::RE_Compiler(PabloKernel * kernel, cc::CC_Compiler & ccCompiler)
    602 : mEntryScope(kernel->getEntryScope())
     601RE_Compiler::RE_Compiler(PabloBlock * scope, cc::CC_Compiler & ccCompiler)
     602: mEntryScope(scope)
    603603, mCCCompiler(ccCompiler)
    604604, mLineBreak(nullptr)
  • icGREP/icgrep-devel/icgrep/re/re_compiler.h

    r5881 r5888  
    11/*
    2  *  Copyright (c) 2014 International Characters.
     2 *  Copyright (c) 2018 International Characters.
    33 *  This software is licensed to the public under the Open Software License 3.0.
    44 *  icgrep is a trademark of International Characters.
     
    1414namespace cc { class CC_Compiler; class Alphabet;}
    1515namespace pablo { class PabloAST; }
    16 namespace pablo { class PabloBuilder; }
    17 namespace pablo { class PabloKernel; }
     16namespace pablo { class PabloBlock; }
    1817namespace pablo { class Var; }
    1918namespace re { class Alt; }
     
    5150    };
    5251
    53     RE_Compiler(pablo::PabloKernel * kernel, cc::CC_Compiler & ccCompiler);
     52    RE_Compiler(pablo::PabloBlock * scope, cc::CC_Compiler & ccCompiler);
    5453   
    5554    //
     
    136135    std::vector<std::unique_ptr<cc::CC_Compiler>>   mAlphabetCompilers;
    137136
    138     bool                                            mCountOnly;
    139137    cc::CC_Compiler &                               mCCCompiler;
    140138    pablo::PabloAST *                               mLineBreak;
Note: See TracChangeset for help on using the changeset viewer.