Ignore:
Timestamp:
Aug 29, 2016, 3:37:03 PM (3 years ago)
Author:
cameron
Message:

Some clean ups of encoding info for ccc restructuring.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • icGREP/icgrep-devel/icgrep/grep_engine.cpp

    r5136 r5137  
    1414#include <pablo/pablo_toolchain.h>
    1515#include <toolchain.h>
    16 #include <utf_encoding.h>
    1716#include <pablo/pablo_compiler.h>
    1817#include <kernels/pipeline.h>
     
    130129    const unsigned bufferSegments = codegen::BufferSegments;
    131130
    132     Encoding::Type type;
    133     type = UTF_16 ? Encoding::Type::UTF_16 : Encoding::Type::UTF_8;
    134     unsigned bits;
    135     bits = UTF_16 ? 16 : 8;
    136 
    137     Encoding encoding(type, bits);
     131    unsigned encodingBits = UTF_16 ? 16 : 8;
     132
    138133    mIsNameExpression = isNameExpression;
    139134
     
    164159    s2pk.generateKernel({&ByteStream}, {&BasisBits});
    165160
    166     re_ast = re::regular_expression_passes(encoding, re_ast);   
    167     pablo::PabloFunction * function = re::re2pablo_compiler(encoding, re_ast, CountOnly);
     161    re_ast = re::regular_expression_passes(re_ast);   
     162    pablo::PabloFunction * function = re::re2pablo_compiler(encodingBits, re_ast, CountOnly);
    168163    pablo_function_passes(function);
    169164
Note: See TracChangeset for help on using the changeset viewer.