Changeset 6840e7c for src/SynTree/TupleExpr.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/TupleExpr.cc (modified) (5 diffs)

src/SynTree/TupleExpr.cc

@@ -28 +28 @@
 #include "Type.h"               // for TupleType, Type
 
-UntypedTupleExpr::UntypedTupleExpr( const std::list< Expression * > & exprs, Expression *_aname ) : Expression( _aname ), exprs( exprs ) {
+UntypedTupleExpr::UntypedTupleExpr( const std::list< Expression * > & exprs ) : Expression(), exprs( exprs ) {
 }
 
@@ -39 +39 @@
 }
 
-void UntypedTupleExpr::print( std::ostream &os, int indent ) const {
+void UntypedTupleExpr::print( std::ostream &os, Indenter indent ) const {
         os << "Untyped Tuple:" << std::endl;
-        printAll( exprs, os, indent+2 );
+        printAll( exprs, os, indent+1 );
         Expression::print( os, indent );
 }
 
-TupleExpr::TupleExpr( const std::list< Expression * > & exprs, Expression *_aname ) : Expression( _aname ), exprs( exprs ) {
+TupleExpr::TupleExpr( const std::list< Expression * > & exprs ) : Expression(), exprs( exprs ) {
         set_result( Tuples::makeTupleType( exprs ) );
 }
@@ -57 +57 @@
 }
 
-void TupleExpr::print( std::ostream &os, int indent ) const {
+void TupleExpr::print( std::ostream &os, Indenter indent ) const {
         os << "Tuple:" << std::endl;
-        printAll( exprs, os, indent+2 );
+        printAll( exprs, os, indent+1 );
         Expression::print( os, indent );
 }
@@ -78 +78 @@
 }
 
-void TupleIndexExpr::print( std::ostream &os, int indent ) const {
+void TupleIndexExpr::print( std::ostream &os, Indenter indent ) const {
         os << "Tuple Index Expression, with tuple:" << std::endl;
-        os << std::string( indent+2, ' ' );
-        tuple->print( os, indent+2 );
-        os << std::string( indent+2, ' ' ) << "with index: " << index << std::endl;
+        os << indent+1;
+        tuple->print( os, indent+1 );
+        os << indent+1 << "with index: " << index << std::endl;
         Expression::print( os, indent );
 }
 
-TupleAssignExpr::TupleAssignExpr( const std::list< Expression * > & assigns, const std::list< ObjectDecl * > & tempDecls, Expression * _aname ) : Expression( _aname ) {
+TupleAssignExpr::TupleAssignExpr( const std::list< Expression * > & assigns, const std::list< ObjectDecl * > & tempDecls ) : Expression() {
         // convert internally into a StmtExpr which contains the declarations and produces the tuple of the assignments
         set_result( Tuples::makeTupleType( assigns ) );
@@ -109 +109 @@
 }
 
-void TupleAssignExpr::print( std::ostream &os, int indent ) const {
+void TupleAssignExpr::print( std::ostream &os, Indenter indent ) const {
         os << "Tuple Assignment Expression, with stmt expr:" << std::endl;
-        os << std::string( indent+2, ' ' );
-        stmtExpr->print( os, indent+4 );
+        os << indent+1;
+        stmtExpr->print( os, indent+1 );
         Expression::print( os, indent );
 }