Changeset 89231bc for src/SynTree/Statement.cc

Timestamp:

Apr 26, 2016, 12:55:40 PM (9 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:

60089f4, 668edd6b

Parents:

dc5376a

Message:

fix printing for various AST nodes, including ObjectDecl?, ExprStmt?, etc. - assume preceding indentation printed by parent

File:

• src/SynTree/Statement.cc (modified) (10 diffs)

src/SynTree/Statement.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Wed Dec 09 14:09:34 2015
+// Last Modified On : Tue Apr 26 12:33:33 2016
 // Update Count     : 54
 //
@@ -43 +43 @@
 
 void ExprStmt::print( std::ostream &os, int indent ) const {
-        os << string( indent, ' ' ) << "Expression Statement:" << endl;
+        os << "Expression Statement:" << endl << std::string( indent, ' ' );
         expr->print( os, indent + 2 );
 }
@@ -110 +110 @@
 
 void ReturnStmt::print( std::ostream &os, int indent ) const {
-        os << std::string( indent, ' ' ) << string ( isThrow? "Throw":"Return" ) << " Statement, returning: ";
-        if ( expr != 0 ) expr->print( os );
+        os << string ( isThrow? "Throw":"Return" ) << " Statement, returning: ";
+        if ( expr != 0 ) {
+                os << endl << string( indent+2, ' ' );
+                expr->print( os, indent + 2 );
+        }
         os << endl;
 }
@@ -124 +127 @@
 
 void IfStmt::print( std::ostream &os, int indent ) const {
-        os << string( indent, ' ' ) << "If on condition: " << endl ;
+        os << "If on condition: " << endl ;
         condition->print( os, indent + 4 );
 
@@ -153 +156 @@
 
 void SwitchStmt::print( std::ostream &os, int indent ) const {
-        os << string( indent, ' ' ) << "Switch on condition: ";
+        os << "Switch on condition: ";
         condition->print( os );
         os << endl;
@@ -218 +221 @@
 
 void ChooseStmt::print( std::ostream &os, int indent ) const {
-        os << string( indent, ' ' ) << "Choose on condition: ";
+        os << "Choose on condition: ";
         condition->print( os );
         os << endl;
@@ -247 +250 @@
 
 void WhileStmt::print( std::ostream &os, int indent ) const {
-        os << string( indent, ' ' ) << "While on condition: " << endl ;
+        os << "While on condition: " << endl ;
         condition->print( os, indent + 4 );
 
@@ -273 +276 @@
 
 void ForStmt::print( std::ostream &os, int indent ) const {
-        os << string( indent, ' ' ) << "Labels: {";
+        os << "Labels: {";
         for ( std::list<Label>::const_iterator it = get_labels().begin(); it != get_labels().end(); ++it) {
                 os << *it << ",";
@@ -314 +317 @@
 
 void TryStmt::print( std::ostream &os, int indent ) const {
-        os << string( indent, ' ' ) << "Try Statement" << endl;
+        os << "Try Statement" << endl;
         os << string( indent + 2, ' ' ) << "with block: " << endl;
         block->print( os, indent + 4 );
@@ -378 +381 @@
 
 void NullStmt::print( std::ostream &os, int indent ) const {
-        os << string( indent, ' ' ) << "Null Statement" << endl ;
+        os << "Null Statement" << endl ;
 }