Ignore:
Timestamp:
Nov 18, 2016, 1:46:55 PM (2 years ago)
Author:
nmedfort
Message:

Merged PabloFunction? and PabloKernel? classes. Updated projects where necessary.

File:
1 edited

Legend:

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

    r5202 r5217  
    1818#include <utf8_encoder.h>
    1919#include <cc/cc_compiler.h>
    20 #include <pablo/function.h>
     20#include <pablo/prototype.h>
     21#include <pablo/pablo_kernel.h>
    2122#include <re/printer_re.h>
    2223#include <llvm/Support/CommandLine.h>
     
    9596}
    9697   
    97 PabloFunction * re2pablo_compiler(const unsigned encodingBits, RE * re_ast, const bool CountOnly) {
    98     PabloFunction * function = PabloFunction::Create("process_block");
    99     cc::CC_Compiler cc_compiler(*function, encodingBits);
    100     re::RE_Compiler re_compiler(*function, cc_compiler, CountOnly);
     98void re2pablo_compiler(PabloKernel * kernel, const unsigned encodingBits, RE * re_ast, const bool CountOnly) {
     99    cc::CC_Compiler cc_compiler(kernel, encodingBits);
     100    re::RE_Compiler re_compiler(kernel, cc_compiler, CountOnly);
    101101    re_compiler.initializeRequiredStreams(encodingBits);
    102102    re_compiler.compileUnicodeNames(re_ast);
    103103    re_compiler.finalizeMatchResult(re_compiler.compile(re_ast), AlgorithmOptions.isSet(InvertMatches));
    104     return function;
    105104}
    106105
Note: See TracChangeset for help on using the changeset viewer.