Changes in src/SynTree/Statement.cc [74d1804:3be261a]

File:

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

src/SynTree/Statement.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Thu May 12 13:33:18 2016
+// Last Modified On : Wed Dec 09 14:09:34 2015
 // Update Count     : 54
 //
@@ -43 +43 @@
 
 void ExprStmt::print( std::ostream &os, int indent ) const {
-        os << "Expression Statement:" << endl << std::string( indent + 2, ' ' );
+        os << string( indent, ' ' ) << "Expression Statement:" << endl;
         expr->print( os, indent + 2 );
 }
@@ -110 +110 @@
 
 void ReturnStmt::print( std::ostream &os, int indent ) const {
-        os << string ( isThrow? "Throw":"Return" ) << " Statement, returning: ";
-        if ( expr != 0 ) {
-                os << endl << string( indent+2, ' ' );
-                expr->print( os, indent + 2 );
-        }
+        os << std::string( indent, ' ' ) << string ( isThrow? "Throw":"Return" ) << " Statement, returning: ";
+        if ( expr != 0 ) expr->print( os );
         os << endl;
 }
@@ -127 +124 @@
 
 void IfStmt::print( std::ostream &os, int indent ) const {
-        os << "If on condition: " << endl ;
-        os << string( indent+4, ' ' );
+        os << string( indent, ' ' ) << "If on condition: " << endl ;
         condition->print( os, indent + 4 );
 
-        os << string( indent+2, ' ' ) << "... then: " << endl;
-
-        os << string( indent+4, ' ' );
+        os << string( indent, ' ' ) << ".... and branches: " << endl;
+
         thenPart->print( os, indent + 4 );
 
         if ( elsePart != 0 ) {
-                os << string( indent+2, ' ' ) << "... else: " << endl;
-                os << string( indent+4, ' ' );
                 elsePart->print( os, indent + 4 );
         } // if
@@ -160 +153 @@
 
 void SwitchStmt::print( std::ostream &os, int indent ) const {
-        os << "Switch on condition: ";
+        os << string( indent, ' ' ) << "Switch on condition: ";
         condition->print( os );
         os << endl;
@@ -225 +218 @@
 
 void ChooseStmt::print( std::ostream &os, int indent ) const {
-        os << "Choose on condition: ";
+        os << string( indent, ' ' ) << "Choose on condition: ";
         condition->print( os );
         os << endl;
@@ -254 +247 @@
 
 void WhileStmt::print( std::ostream &os, int indent ) const {
-        os << "While on condition: " << endl ;
+        os << string( indent, ' ' ) << "While on condition: " << endl ;
         condition->print( os, indent + 4 );
 
@@ -280 +273 @@
 
 void ForStmt::print( std::ostream &os, int indent ) const {
-        os << "Labels: {";
+        os << string( indent, ' ' ) << "Labels: {";
         for ( std::list<Label>::const_iterator it = get_labels().begin(); it != get_labels().end(); ++it) {
                 os << *it << ",";
@@ -290 +283 @@
         os << string( indent + 2, ' ' ) << "initialization: \n";
         for ( std::list<Statement *>::const_iterator it = initialization.begin(); it != initialization.end(); ++it ) {
-                os << string( indent + 4, ' ' );
                 (*it)->print( os, indent + 4 );
         }
 
         os << "\n" << string( indent + 2, ' ' ) << "condition: \n";
-        if ( condition != 0 ) {
-                os << string( indent + 4, ' ' );
+        if ( condition != 0 )
                 condition->print( os, indent + 4 );
-        }
 
         os << "\n" << string( indent + 2, ' ' ) << "increment: \n";
-        if ( increment != 0 ) {
-                os << string( indent + 4, ' ' );
+        if ( increment != 0 )
                 increment->print( os, indent + 4 );
-        }
 
         os << "\n" << string( indent + 2, ' ' ) << "statement block: \n";
-        if ( body != 0 ) {
-                os << string( indent + 4, ' ' );
+        if ( body != 0 )
                 body->print( os, indent + 4 );
-        }
 
         os << endl;
@@ -328 +314 @@
 
 void TryStmt::print( std::ostream &os, int indent ) const {
-        os << "Try Statement" << endl;
+        os << string( indent, ' ' ) << "Try Statement" << endl;
         os << string( indent + 2, ' ' ) << "with block: " << endl;
         block->print( os, indent + 4 );
@@ -358 +344 @@
 
 void CatchStmt::print( std::ostream &os, int indent ) const {
-        os << "Catch Statement" << endl;
+        os << string( indent, ' ' ) << "Catch Statement" << endl;
 
         os << string( indent, ' ' ) << "... catching" << endl;
@@ -383 +369 @@
 
 void FinallyStmt::print( std::ostream &os, int indent ) const {
-        os << "Finally Statement" << endl;
+        os << string( indent, ' ' ) << "Finally Statement" << endl;
         os << string( indent + 2, ' ' ) << "with block: " << endl;
         block->print( os, indent + 4 );
@@ -392 +378 @@
 
 void NullStmt::print( std::ostream &os, int indent ) const {
-        os << "Null Statement" << endl ;
-}
-
-ImplicitCtorDtorStmt::ImplicitCtorDtorStmt( Statement * callStmt ) : Statement( std::list<Label>() ), callStmt( callStmt ) {
-        assert( callStmt );
-}
-
-ImplicitCtorDtorStmt::ImplicitCtorDtorStmt( const ImplicitCtorDtorStmt & other ) : Statement( other ), callStmt( maybeClone( other.callStmt ) ) {
-}
-
-ImplicitCtorDtorStmt::~ImplicitCtorDtorStmt() {
-        delete callStmt;
-}
-
-void ImplicitCtorDtorStmt::print( std::ostream &os, int indent ) const {
-        os << "Implicit Ctor Dtor Statement" << endl;
-        os << string( indent + 2, ' ' ) << "with Ctor/Dtor: ";
-        callStmt->print( os, indent + 2);
-        os << endl;
+        os << string( indent, ' ' ) << "Null Statement" << endl ;
 }