Ignore:
Timestamp:
Oct 26, 2017, 11:23:26 AM (7 years ago)
Author:
Rob Schluntz <rschlunt@…>
Branches:
ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum
Children:
136ccd7
Parents:
0b9be4d (diff), 598f50e (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.
git-author:
Rob Schluntz <rschlunt@…> (10/26/17 10:43:08)
git-committer:
Rob Schluntz <rschlunt@…> (10/26/17 11:23:26)
Message:

Merge branch 'fix-missing-cast-warning' into cleanup-dtors

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/SynTree/ApplicationExpr.cc

    r0b9be4d r4ee1efb  
    5959
    6060ApplicationExpr::ApplicationExpr( const ApplicationExpr &other ) :
    61                 Expression( other ), function( maybeClone( other.function ) ), inferParams( other.inferParams ) {
     61                Expression( other ), function( maybeClone( other.function ) ) {
    6262        cloneAll( other.args, args );
    6363}
     
    6666        delete function;
    6767        deleteAll( args );
    68 }
    69 
    70 void printInferParams( const InferredParams & inferParams, std::ostream &os, Indenter indent, int level ) {
    71         if ( ! inferParams.empty() ) {
    72                 os << indent << "with inferred parameters " << level << ":" << std::endl;
    73                 for ( InferredParams::const_iterator i = inferParams.begin(); i != inferParams.end(); ++i ) {
    74                         os << indent+1;
    75                         Declaration::declFromId( i->second.decl )->printShort( os, indent+1 );
    76                         os << std::endl;
    77                         printInferParams( *i->second.inferParams, os, indent+1, level+1 );
    78                 } // for
    79         } // if
    8068}
    8169
     
    8876                printAll( args, os, indent+1 );
    8977        } // if
    90         printInferParams( inferParams, os, indent+1, 0 );
    9178        Expression::print( os, indent );
    9279}
Note: See TracChangeset for help on using the changeset viewer.