Changeset 4358


Ignore:
Timestamp:
Dec 24, 2014, 5:52:02 PM (4 years ago)
Author:
cameron
Message:

Clean up various minor issues that generate compiler warnings.

Location:
icGREP/icgrep-devel/icgrep
Files:
16 edited

Legend:

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

    r4357 r4358  
    3939CC_Compiler::CC_Compiler(PabloBlock & cg, const Encoding encoding, const bool annotateVariableConstraints, const std::string basis_pattern)
    4040: mCG(cg)
    41 , mAnnotateVariableConstraints(annotateVariableConstraints)
     41//, mAnnotateVariableConstraints(annotateVariableConstraints)
    4242, mBasisBit(encoding.getBits())
    4343, mEncoding(encoding)
     
    9191        }
    9292    }
    93     else if (CC * cc = dyn_cast<CC>(re)) {
     93    else if (isa<CC>(re)) {
    9494        std::cerr << "Shouldn't get here\n";
    9595        exit(-1);
  • icGREP/icgrep-devel/icgrep/cc/cc_compiler.h

    r4357 r4358  
    4848private:
    4949    pablo::PabloBlock &         mCG;
    50     const bool                  mAnnotateVariableConstraints;
     50    //const bool                  mAnnotateVariableConstraints;
    5151    std::vector<pablo::Var *>   mBasisBit;
    5252    const Encoding              mEncoding;
  • icGREP/icgrep-devel/icgrep/do_grep.cpp

    r4327 r4358  
    106106    int block_base  = 0;
    107107    int block_pos   = 0;
    108     int buffer_pos  = 0;
    109108    int chars_avail = 0;
    110     int chars_read  = 0;
    111109    int line_start = 0;
    112     int line_end = 0;
    113     int match_pos = 0;
    114110    line_no = 1;
    115111
  • icGREP/icgrep-devel/icgrep/do_grep.h

    r4327 r4358  
    4949public:
    5050    GrepExecutor(int carry_count, int advance_count, process_block_fcn process_block):
    51     mCarries(carry_count), mAdvances(advance_count),
    5251    mCountOnlyOption(false), mShowFileNameOption(false), mShowLineNumberingOption(false),
     52    mCarries(carry_count), mAdvances(advance_count),
    5353    mProcessBlockFcn(process_block), outfile(stdout)
    5454    {}
  • icGREP/icgrep-devel/icgrep/pablo/pabloAST.h

    r4284 r4358  
    220220    private:
    221221        const Statement * mCurrent;
    222         friend class iterator;
     222        friend struct iterator;
    223223    };
    224224
     
    294294    private:
    295295        const Statement * mCurrent;
    296         friend class iterator;
     296        friend struct iterator;
    297297    };
    298298
  • icGREP/icgrep-devel/icgrep/pablo/pe_and.h

    r4284 r4358  
    4747    And(PabloAST * expr1, PabloAST * expr2)
    4848    : PabloAST(ClassTypeId::And)
    49     , mExprs({expr1, expr2})
     49    , mExprs({{expr1, expr2}})
    5050    {
    5151
  • icGREP/icgrep-devel/icgrep/pablo/pe_matchstar.h

    r4280 r4358  
    4444    MatchStar(PabloAST * marker, PabloAST * cc)
    4545    : PabloAST(ClassTypeId::MatchStar)
    46     , mExprs({marker, cc})
     46    , mExprs({{marker, cc}})
    4747    {
    4848
  • icGREP/icgrep-devel/icgrep/pablo/pe_next.h

    r4284 r4358  
    4343    Next(PabloAST * initial, PabloAST * expr, StatementList * parent)
    4444    : Statement(ClassTypeId::Next, parent)
    45     , mExprs({cast<Assign>(initial), expr})
     45    , mExprs({{cast<Assign>(initial), expr}})
    4646    {
    4747
  • icGREP/icgrep-devel/icgrep/pablo/pe_or.h

    r4284 r4358  
    4747    Or(PabloAST * expr1, PabloAST * expr2)
    4848    : PabloAST(ClassTypeId::Or)
    49     , mExprs({expr1, expr2})
     49    , mExprs({{expr1, expr2}})
    5050    {
    5151
  • icGREP/icgrep-devel/icgrep/pablo/pe_scanthru.h

    r4280 r4358  
    4343    ScanThru(PabloAST * from, PabloAST * thru)
    4444    : PabloAST(ClassTypeId::ScanThru)
    45     , mExprs({from, thru})
     45    , mExprs({{from, thru}})
    4646    {
    4747
  • icGREP/icgrep-devel/icgrep/pablo/pe_sel.h

    r4284 r4358  
    5050    Sel(PabloAST* if_expr, PabloAST* t_expr, PabloAST* f_expr)
    5151    : PabloAST(ClassTypeId::Sel)
    52     , mExprs({if_expr, t_expr, f_expr})
     52    , mExprs({{if_expr, t_expr, f_expr}})
    5353    {
    5454
  • icGREP/icgrep-devel/icgrep/pablo/pe_xor.h

    r4284 r4358  
    4747    Xor(PabloAST * expr1, PabloAST * expr2)
    4848    : PabloAST(ClassTypeId::Xor)
    49     , mExprs({expr1, expr2})
     49    , mExprs({{expr1, expr2}})
    5050    {
    5151
  • icGREP/icgrep-devel/icgrep/pablo/ps_assign.h

    r4284 r4358  
    5151    Assign(PabloAST * name, PabloAST * expr, const int outputIndex, StatementList * parent)
    5252    : Statement(ClassTypeId::Assign, parent)
    53     , mExprs({name, expr})
     53    , mExprs({{name, expr}})
    5454    , mOutputIndex(outputIndex)
    5555    {
  • icGREP/icgrep-devel/icgrep/re/re_compiler.cpp

    r4357 r4358  
    6262, mInitial(nullptr)
    6363, mNonFinal(nullptr)
    64 , mNameMap(nameMap)
    6564{
    6665
  • icGREP/icgrep-devel/icgrep/re/re_compiler.h

    r4340 r4358  
    9393
    9494    pablo::PabloBlock &                             mCG;
    95     const cc::CC_NameMap &                          mNameMap;
    9695    pablo::Var *                                    mLineFeed;
    9796    pablo::PabloAST *                               mCRLF;
  • icGREP/icgrep-devel/icgrep/re/re_parser.cpp

    r4343 r4358  
    306306    ++_cursor;
    307307    throw_incomplete_expression_error_if_end_of_stream();
    308     RE * rep = nullptr;
    309308    if (*_cursor == ',') {
    310309        ++_cursor;
Note: See TracChangeset for help on using the changeset viewer.