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/pablo/builder.hpp

    r5202 r5217  
    8181    Extract * createExtract(PabloAST * value, not_null<PabloAST *> index);
    8282
    83     inline Extract * createExtract(PabloAST * value, const Integer::Type index) {
     83    inline Extract * createExtract(PabloAST * value, const int64_t index) {
    8484        return createExtract(value, getInteger(index));
    8585    }
     
    8787    Extract * createExtract(PabloAST * value, not_null<PabloAST *> index, const std::string & prefix);
    8888
    89     inline Extract * createExtract(PabloAST * value, const Integer::Type index, const std::string & prefix) {
     89    inline Extract * createExtract(PabloAST * value, const int64_t index, const std::string & prefix) {
    9090        return createExtract(value, getInteger(index), prefix);
    9191    }
     
    9797    Call * createCall(Prototype * prototype, const std::vector<PabloAST *> &vars);
    9898
    99     inline PabloAST * createAdvance(PabloAST * expr, const Integer::Type shiftAmount) {
     99    inline PabloAST * createAdvance(PabloAST * expr, const int64_t shiftAmount) {
    100100        return createAdvance(expr, mPb->getInteger(shiftAmount));
    101101    }
     
    103103    PabloAST * createAdvance(PabloAST * expr, PabloAST * shiftAmount);
    104104
    105     inline PabloAST * createAdvance(PabloAST * expr, const Integer::Type shiftAmount, const std::string & prefix) {
     105    inline PabloAST * createAdvance(PabloAST * expr, const int64_t shiftAmount, const std::string & prefix) {
    106106        return createAdvance(expr, mPb->getInteger(shiftAmount), prefix);
    107107    }
     
    109109    PabloAST * createAdvance(PabloAST * expr, PabloAST * shiftAmount, const std::string & prefix);
    110110
    111     inline PabloAST * createLookahead(PabloAST * expr, const Integer::Type shiftAmount) {
     111    inline PabloAST * createLookahead(PabloAST * expr, const int64_t shiftAmount) {
    112112        if (shiftAmount == 0) {
    113113            return expr;
     
    118118    PabloAST * createLookahead(PabloAST * expr, PabloAST * shiftAmount);
    119119
    120     inline PabloAST * createLookahead(PabloAST * expr, const Integer::Type shiftAmount, const std::string & prefix) {
     120    inline PabloAST * createLookahead(PabloAST * expr, const int64_t shiftAmount, const std::string & prefix) {
    121121        if (shiftAmount == 0) {
    122122            return expr;
     
    169169    PabloAST * createAtEOF(PabloAST * expr, const std::string & prefix);
    170170   
     171    PabloAST * createAdd(PabloAST * expr1, PabloAST * expr2);
     172
     173    PabloAST * createAdd(PabloAST * expr1, PabloAST * expr2, const std::string & prefix);
     174
     175    PabloAST * createSubtract(PabloAST * expr1, PabloAST * expr2);
     176
     177    PabloAST * createSubtract(PabloAST * expr1, PabloAST * expr2, const std::string & prefix);
     178
    171179    inline If * createIf(PabloAST * condition, PabloBlock * body) {
    172180        return mPb->createIf(condition, body);
     
    231239    }
    232240
    233     inline String * getName(const std::string name) const {
     241    inline String * getName(const std::string & name) const {
    234242        return mPb->getName(name);
    235243    }
     
    239247    }
    240248
    241     inline Integer * getInteger(Integer::Type value) const {
     249    inline Integer * getInteger(const uint64_t value) const {
    242250        return mPb->getInteger(value);
    243     }
    244 
    245     inline SymbolGenerator * getSymbolTable() const {
    246         return mPb->getSymbolTable();
    247251    }
    248252
Note: See TracChangeset for help on using the changeset viewer.