Ignore:
Timestamp:
Jun 26, 2017, 4:48:35 PM (5 years ago)
Author:
Rob Schluntz <rschlunt@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, deferred_resn, demangler, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, resolv-new, with_gc
Children:
bb1cd95
Parents:
e4d829b (diff), 2a7b3ca (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 designations

Conflicts:

src/InitTweak/FixInit.cc
src/SymTab/Autogen.h
src/SynTree/Initializer.cc
src/SynTree/Initializer.h
src/Tuples/TupleExpansion.cc

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/SynTree/Expression.cc

    re4d829b r579263a  
    287287}
    288288
    289 // CastExpr *CastExpr::clone() const { return 0; }
    290 
    291289void CastExpr::print( std::ostream &os, int indent ) const {
    292290        os << "Cast of:" << std::endl << std::string( indent+2, ' ' );
     
    354352}
    355353
    356 //// is this right? It's cloning the member, but the member is a declaration so probably shouldn't be cloned...
    357354MemberExpr::MemberExpr( const MemberExpr &other ) :
    358355                Expression( other ), member( other.member ), aggregate( maybeClone( other.aggregate ) ) {
     
    360357
    361358MemberExpr::~MemberExpr() {
    362         // delete member;
     359        // don't delete the member declaration, since it points somewhere else in the tree
    363360        delete aggregate;
    364361}
     
    590587}
    591588
    592 UntypedValofExpr::UntypedValofExpr( const UntypedValofExpr & other ) : Expression( other ), body ( maybeClone( other.body ) ) {}
    593 
    594 UntypedValofExpr::~UntypedValofExpr() { delete body; }
    595 
    596 void UntypedValofExpr::print( std::ostream &os, int indent ) const {
    597         os << std::string( indent, ' ' ) << "Valof Expression: " << std::endl;
    598         if ( get_body() != 0 )
    599                 get_body()->print( os, indent + 2 );
    600 }
    601 
    602589RangeExpr::RangeExpr( Expression *low, Expression *high ) : low( low ), high( high ) {}
    603590RangeExpr::RangeExpr( const RangeExpr &other ) : Expression( other ), low( other.low->clone() ), high( other.high->clone() ) {}
Note: See TracChangeset for help on using the changeset viewer.