Changeset d7903b1 for src/SynTree/CommaExpr.cc

Timestamp:

May 2, 2016, 3:19:54 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, 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, pthread-emulation, qualifiedEnum, 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:

• src/SynTree/CommaExpr.cc (modified) (3 diffs)

src/SynTree/CommaExpr.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Wed Apr 06 17:07:54 2016
+// Last Modified On : Mon May 02 15:19:44 2016
 // Update Count     : 1
 //
@@ -21 +21 @@
                 : Expression( _aname ), arg1( arg1 ), arg2( arg2 ) {
         // xxx - result of a comma expression is never an lvalue, so should set lvalue
-        // to false on all result types
+        // to false on all result types. Actually doing this causes some strange things
+        // to happen in later passes (particularly, Specialize, Lvalue, and Box). This needs to be looked into.
         cloneAll( arg2->get_results(), get_results() );
+        // for ( Type *& type : get_results() ) {
+        //      type->set_isLvalue( false );
+        // }
 }
 
@@ -35 +39 @@
 
 void CommaExpr::print( std::ostream &os, int indent ) const {
-        os << std::string( indent, ' ' ) << "Comma Expression:" << std::endl;
+        os << "Comma Expression:" << std::endl;
+        os << std::string( indent+2, ' ' );
         arg1->print( os, indent+2 );
         os << std::endl;
+        os << std::string( indent+2, ' ' );
         arg2->print( os, indent+2 );
         Expression::print( os, indent );