Ignore:
Timestamp:
Dec 5, 2017, 2:35:03 PM (5 years ago)
Author:
Rob Schluntz <rschlunt@…>
Branches:
arm-eh, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum
Children:
f9feab8
Parents:
9c35431 (diff), 65197c2 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' into cleanup-dtors

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/SymTab/Autogen.h

    r9c35431 rc13e8dc8  
    107107                fExpr->args.splice( fExpr->args.end(), args );
    108108
    109                 *out++ = new ExprStmt( noLabels, fExpr );
     109                *out++ = new ExprStmt( fExpr );
    110110
    111111                srcParam.clearArrayIndices();
     
    165165
    166166                // for stmt's body, eventually containing call
    167                 CompoundStmt * body = new CompoundStmt( noLabels );
     167                CompoundStmt * body = new CompoundStmt();
    168168                Statement * listInit = genCall( srcParam, dstParam, fname, back_inserter( body->kids ), array->base, addCast, forward );
    169169
    170170                // block containing for stmt and index variable
    171171                std::list<Statement *> initList;
    172                 CompoundStmt * block = new CompoundStmt( noLabels );
    173                 block->push_back( new DeclStmt( noLabels, index ) );
     172                CompoundStmt * block = new CompoundStmt();
     173                block->push_back( new DeclStmt( index ) );
    174174                if ( listInit ) block->get_kids().push_back( listInit );
    175                 block->push_back( new ForStmt( noLabels, initList, cond, inc, body ) );
     175                block->push_back( new ForStmt( initList, cond, inc, body ) );
    176176
    177177                *out++ = block;
Note: See TracChangeset for help on using the changeset viewer.