Ignore:
Timestamp:
Mar 18, 2018, 11:27:16 AM (18 months ago)
Author:
cameron
Message:

Restructuring step

File:
1 edited

Legend:

Unmodified
Added
Removed
  • icGREP/icgrep-devel/icgrep/grep/grep_engine.h

    r5894 r5913  
    3131};
    3232
    33 void accumulate_match_wrapper(intptr_t accum_addr, const size_t lineNum, char * line_start, char * line_end);
     33extern "C" void accumulate_match_wrapper(intptr_t accum_addr, const size_t lineNum, char * line_start, char * line_end);
    3434
    35 void finalize_match_wrapper(intptr_t accum_addr, char * buffer_end);
     35extern "C" void finalize_match_wrapper(intptr_t accum_addr, char * buffer_end);
    3636
    3737void grepBuffer(re::RE * pattern, const char * buffer, size_t bufferLength, MatchAccumulator * accum);
     
    4646    void setRecordBreak(GrepRecordBreakKind b);
    4747    void initFileResult(std::vector<std::string> & filenames);
    48     virtual void grepCodeGen(std::vector<re::RE *> REs);
     48    void initREs(std::vector<re::RE *> & REs);
     49    virtual void grepCodeGen();
    4950    bool searchAllFiles();
    5051    void * DoGrepThreadMethod();
    5152
    5253protected:
    53     std::pair<parabix::StreamSetBuffer *, parabix::StreamSetBuffer *> grepPipeline(std::vector<re::RE *> & REs, parabix::StreamSetBuffer * ByteStream);
     54    std::pair<parabix::StreamSetBuffer *, parabix::StreamSetBuffer *> grepPipeline(parabix::StreamSetBuffer * ByteStream);
    5455
    5556    virtual uint64_t doGrep(const std::string & fileName, const uint32_t fileIdx);
     
    6667    bool grepMatchFound;
    6768    GrepRecordBreakKind mGrepRecordBreak;
    68 
     69   
     70    std::vector<re:: RE *> mREs;
     71    std::set<re::Name *> mUnicodeProperties;
     72    re::CC * mBreakCC;
    6973    std::unique_ptr<cc::MultiplexedAlphabet> mpx;
    7074    std::string mFileSuffix;
     
    7680public:
    7781    EmitMatchesEngine();
    78     void grepCodeGen(std::vector<re::RE *> REs) override;
     82    void grepCodeGen() override;
    7983private:
    8084    uint64_t doGrep(const std::string & fileName, const uint32_t fileIdx) override;
Note: See TracChangeset for help on using the changeset viewer.