Changeset 6840e7c for src/SynTree/CommaExpr.cc

Timestamp:

Oct 19, 2017, 12:01:04 PM (8 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:

837ce06

Parents:

b96ec83 (diff), a15b72c (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:

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

src/SynTree/CommaExpr.cc

@@ -21 +21 @@
 #include "Type.h"            // for Type
 
-CommaExpr::CommaExpr( Expression *arg1, Expression *arg2, Expression *_aname )
-                : Expression( _aname ), arg1( arg1 ), arg2( arg2 ) {
+CommaExpr::CommaExpr( Expression *arg1, Expression *arg2 )
+                : Expression(), arg1( arg1 ), arg2( arg2 ) {
         // xxx - result of a comma expression is never an lvalue, so should set lvalue
         // to false on all result types. Actually doing this causes some strange things
@@ -39 +39 @@
 }
 
-void CommaExpr::print( std::ostream &os, int indent ) const {
+void CommaExpr::print( std::ostream &os, Indenter indent ) const {
         os << "Comma Expression:" << std::endl;
-        os << std::string( indent+2, ' ' );
-        arg1->print( os, indent+2 );
+        os << (indent+1);
+        arg1->print( os, indent+1 );
         os << std::endl;
-        os << std::string( indent+2, ' ' );
-        arg2->print( os, indent+2 );
+        os << (indent+1);
+        arg2->print( os, indent+1 );
         Expression::print( os, indent );
 }