Ignore:
Timestamp:
May 2, 2016, 3:19:54 PM (6 years ago)
Author:
Rob Schluntz <rschlunt@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, resolv-new, with_gc
Children:
2e3a379
Parents:
fbfde843 (diff), 60089f4 (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 'fix-tree-printing' into ctor

Conflicts:

src/SynTree/CommaExpr.cc
src/SynTree/CompoundStmt.cc

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/SynTree/CommaExpr.cc

    rfbfde843 rd7903b1  
    1010// Created On       : Mon May 18 07:44:20 2015
    1111// Last Modified By : Rob Schluntz
    12 // Last Modified On : Wed Apr 06 17:07:54 2016
     12// Last Modified On : Mon May 02 15:19:44 2016
    1313// Update Count     : 1
    1414//
     
    2121                : Expression( _aname ), arg1( arg1 ), arg2( arg2 ) {
    2222        // xxx - result of a comma expression is never an lvalue, so should set lvalue
    23         // to false on all result types
     23        // to false on all result types. Actually doing this causes some strange things
     24        // to happen in later passes (particularly, Specialize, Lvalue, and Box). This needs to be looked into.
    2425        cloneAll( arg2->get_results(), get_results() );
     26        // for ( Type *& type : get_results() ) {
     27        //      type->set_isLvalue( false );
     28        // }
    2529}
    2630
     
    3539
    3640void CommaExpr::print( std::ostream &os, int indent ) const {
    37         os << std::string( indent, ' ' ) << "Comma Expression:" << std::endl;
     41        os << "Comma Expression:" << std::endl;
     42        os << std::string( indent+2, ' ' );
    3843        arg1->print( os, indent+2 );
    3944        os << std::endl;
     45        os << std::string( indent+2, ' ' );
    4046        arg2->print( os, indent+2 );
    4147        Expression::print( os, indent );
Note: See TracChangeset for help on using the changeset viewer.