Ignore:
Timestamp:
Sep 29, 2014, 2:11:34 PM (5 years ago)
Author:
nmedfort
Message:

More refactoring of the RE system; moved the original re/RE_Compiler to compiler.cpp and the PBIX_Compiler to the re/RE_Compiler.

File:
1 edited

Legend:

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

    r4194 r4197  
    66
    77#include "icgrep.h"
    8 
    98#include "utf_encoding.h"
    10 #include "re/re_compiler.h"
     9#include "compiler.h"
    1110
    1211#include <fstream>
     
    2322#include <sys/stat.h>
    2423
    25 #include <simd-lib/bitblock.hpp>
    26 #include <simd-lib/carryQ.hpp>
    27 #include <simd-lib/pabloSupport.hpp>
    28 #include <simd-lib/s2p.hpp>
    29 #include <simd-lib/buffer.hpp>
    30 #include <simd-lib/bitblock_iterator.hpp>
     24#include "include/simd-lib/bitblock.hpp"
     25#include "include/simd-lib/carryQ.hpp"
     26#include "include/simd-lib/pabloSupport.hpp"
     27#include "include/simd-lib/s2p.hpp"
     28#include "include/simd-lib/buffer.hpp"
     29#include "include/simd-lib/bitblock_iterator.hpp"
     30#include "include/simd-lib/transpose.hpp"
    3131
    3232#include "hrtime.h"
     
    6464    BitBlock LF;
    6565};
    66 
    67 #include "include/simd-lib/transpose.hpp"
    6866
    6967using namespace std;
     
    232230    encoding.setMask(0xFF);
    233231
    234     auto * re_compiler = new re::RE_Compiler();
    235232    if (compile_time_option)
    236233    {
     
    238235        timer = getElapsedTime();
    239236    }
    240     LLVM_Gen_RetVal llvm_codegen = re_compiler->compile(compile_time_option,
    241                                                         ascii_only_option,
    242                                                         "basis_bits.bit_",
    243                                                         "temp",
    244                                                         encoding ,
    245                                                         (regex_from_file_option ? fileregex : inregex));
     237    LLVM_Gen_RetVal llvm_codegen = icgrep::compile(compile_time_option,
     238                                                   ascii_only_option,
     239                                                   "basis_bits.bit_",
     240                                                   "temp",
     241                                                   encoding ,
     242                                                   (regex_from_file_option ? fileregex : inregex));
    246243
    247244    if (compile_time_option)
     
    264261    }
    265262
    266     delete re_compiler;
    267263#ifndef USE_MMAP
    268264    fclose(infile);
Note: See TracChangeset for help on using the changeset viewer.