Changes in src/SynTree/Statement.cc [843054c2:de62360d]

File:

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

src/SynTree/Statement.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon May 18 10:55:19 2015
-// Update Count     : 2
+// Last Modified On : Tue Jun 23 11:42:09 2015
+// Update Count     : 21
 //
 
@@ -30 +30 @@
 Statement::Statement( std::list<Label> _labels ) : labels(_labels ) {}
 
-void Statement::print( std::ostream &, int indent ) {}
+void Statement::print( std::ostream &, int indent ) const {}
 
 Statement::~Statement() {}
@@ -38 +38 @@
 ExprStmt::~ExprStmt() {}
 
-void ExprStmt::print( std::ostream &os, int indent ) {
-        os << "\r" << string(indent, ' ') << "Expression Statement:" << endl;
+void ExprStmt::print( std::ostream &os, int indent ) const {
+        os << string( indent, ' ' ) << "Expression Statement:" << endl;
         expr->print( os, indent + 2 );
 } 
@@ -46 +46 @@
 
 BranchStmt::BranchStmt( std::list<Label> labels, Label _target, Type _type ) throw ( SemanticError ) :
-        Statement( labels ), target(_target ), type(_type ) {
+        Statement( labels ), originalTarget(_target ), target(_target ), type(_type ) {
         //actually this is a syntactic error signaled by the parser
         if ( type == BranchStmt::Goto && target.size() == 0 )
@@ -58 +58 @@
 }
 
-void BranchStmt::print( std::ostream &os, int indent ) {
-        os << "\r" << string( indent, ' ') << "Branch (" << brType[type] << ")" << endl ;
+void BranchStmt::print( std::ostream &os, int indent ) const {
+        os << string( indent, ' ' ) << "Branch (" << brType[type] << ")" << endl ;
 }
 
@@ -68 +68 @@
 }
 
-void ReturnStmt::print( std::ostream &os, int indent ) {
-        os << "\r" << std::string( indent, ' ') << string ( isThrow? "Throw":"Return" ) << " Statement, returning: ";
+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 << endl;
@@ -79 +79 @@
 IfStmt::~IfStmt() {}
 
-void IfStmt::print( std::ostream &os, int indent ) {
-        os << "\r" << string( indent, ' ') << "If on condition: " << endl ;
+void IfStmt::print( std::ostream &os, int indent ) const {
+        os << string( indent, ' ' ) << "If on condition: " << endl ;
         condition->print( os, indent + 4 );
 
-        os << string( indent, ' ') << ".... and branches: " << endl;
+        os << string( indent, ' ' ) << ".... and branches: " << endl;
 
         thenPart->print( os, indent + 4 );
@@ -103 +103 @@
 void SwitchStmt::add_case( CaseStmt *c ) {}
 
-void SwitchStmt::print( std::ostream &os, int indent ) {
-        os << "\r" << string( indent, ' ') << "Switch on condition: ";
+void SwitchStmt::print( std::ostream &os, int indent ) const {
+        os << string( indent, ' ' ) << "Switch on condition: ";
         condition->print( os );
         os << endl;
 
         // branches
-        std::list<Statement *>::iterator i;
+        std::list<Statement *>::const_iterator i;
         for ( i = branches.begin(); i != branches.end(); i++)
-                (*i )->print( os, indent + 4 );
+                (*i)->print( os, indent + 4 );
 
         //for_each( branches.begin(), branches.end(), mem_fun( bind1st(&Statement::print ), os ));
@@ -126 +126 @@
 }
 
-void CaseStmt::print( std::ostream &os, int indent ) {
-        os << "\r" << string( indent, ' ');
-
-        if ( isDefault())
+CaseStmt * CaseStmt::makeDefault( std::list<Label> labels, std::list<Statement *> branches ) {
+        return new CaseStmt( labels, 0, branches, true );
+}
+
+void CaseStmt::print( std::ostream &os, int indent ) const {
+        os << string( indent, ' ' );
+
+        if ( isDefault() )
                 os << "Default ";
         else {
@@ -138 +142 @@
         os << endl;
 
-        std::list<Statement *>::iterator i;
+        std::list<Statement *>::const_iterator i;
         for ( i = stmts.begin(); i != stmts.end(); i++)
                 (*i )->print( os, indent + 4 );
@@ -154 +158 @@
 void ChooseStmt::add_case( CaseStmt *c ) {}
 
-void ChooseStmt::print( std::ostream &os, int indent ) {
-        os << "\r" << string( indent, ' ') << "Choose on condition: ";
+void ChooseStmt::print( std::ostream &os, int indent ) const {
+        os << string( indent, ' ' ) << "Choose on condition: ";
         condition->print( os );
         os << endl;
 
         // branches
-        std::list<Statement *>::iterator i;
+        std::list<Statement *>::const_iterator i;
         for ( i = branches.begin(); i != branches.end(); i++)
                 (*i )->print( os, indent + 4 );
@@ -167 +171 @@
 }
 
-void FallthruStmt::print( std::ostream &os, int indent ) {
-        os << "\r" << string( indent, ' ') << "Fall-through statement" << endl;
+void FallthruStmt::print( std::ostream &os, int indent ) const {
+        os << string( indent, ' ' ) << "Fall-through statement" << endl;
 }
 
@@ -179 +183 @@
 }
 
-void WhileStmt::print( std::ostream &os, int indent ) {
-        os << "\r" << string( indent, ' ') << "While on condition: " << endl ;
+void WhileStmt::print( std::ostream &os, int indent ) const {
+        os << string( indent, ' ' ) << "While on condition: " << endl ;
         condition->print( os, indent + 4 );
 
-        os << string( indent, ' ') << ".... with body: " << endl;
+        os << string( indent, ' ' ) << ".... with body: " << endl;
 
         if ( body != 0 ) body->print( os, indent + 4 );
@@ -199 +203 @@
 }
 
-void ForStmt::print( std::ostream &os, int indent ) {
-        os << "\r" << string( indent, ' ') << "For Statement" << endl ;
-
-        os << "\r" << string( indent + 2, ' ') << "initialization: \n"; 
+void ForStmt::print( std::ostream &os, int indent ) const {
+        os << string( indent, ' ' ) << "Labels: {";
+        for ( std::list<Label>::const_iterator it = get_labels().begin(); it != get_labels().end(); ++it) {
+                os << *it << ",";
+        }
+        os << "}" << endl;
+
+        os << string( indent, ' ' ) << "For Statement" << endl ;
+
+        os << string( indent + 2, ' ' ) << "initialization: \n"; 
         if ( initialization != 0 )
                 initialization->print( os, indent + 4 );
 
-        os << "\n\r" << string( indent + 2, ' ') << "condition: \n"; 
+        os << "\n" << string( indent + 2, ' ' ) << "condition: \n"; 
         if ( condition != 0 )
                 condition->print( os, indent + 4 );
 
-        os << "\n\r" << string( indent + 2, ' ') << "increment: \n"; 
+        os << "\n" << string( indent + 2, ' ' ) << "increment: \n"; 
         if ( increment != 0 )
                 increment->print( os, indent + 4 );
 
-        os << "\n\r" << string( indent + 2, ' ') << "statement block: \n"; 
+        os << "\n" << string( indent + 2, ' ' ) << "statement block: \n"; 
         if ( body != 0 )
                 body->print( os, indent + 4 );
@@ -235 +245 @@
 }
 
-void TryStmt::print( std::ostream &os, int indent ) {
-        os << "\r" << string( indent, ' ') << "Try Statement" << endl;
-        os << string( indent + 2, ' ') << "with block: " << endl;
+void TryStmt::print( std::ostream &os, int indent ) const {
+        os << string( indent, ' ' ) << "Try Statement" << endl;
+        os << string( indent + 2, ' ' ) << "with block: " << endl;
         block->print( os, indent + 4 );
 
         // handlers
-        os << string( indent + 2, ' ') << "and handlers: " << endl;
-        std::list<Statement *>::iterator i;
-        for ( i = handlers.begin(); i != handlers.end(); i++)
+        os << string( indent + 2, ' ' ) << "and handlers: " << endl;
+        for ( std::list<Statement *>::const_iterator i = handlers.begin(); i != handlers.end(); i++)
                 (*i )->print( os, indent + 4 );
 
         // finally block
         if ( finallyBlock != 0 ) {
-                os << string( indent + 2, ' ') << "Finally block: " << endl;
+                os << string( indent + 2, ' ' ) << "Finally block: " << endl;
                 finallyBlock->print( os, indent + 4 );
         } // if
@@ -262 +271 @@
 }
 
-void CatchStmt::print( std::ostream &os, int indent ) {
-        os << "\r" << string( indent, ' ') << "Catch Statement" << endl;
-
-        os << "\r" << string( indent, ' ') << "... catching" << endl;
+void CatchStmt::print( std::ostream &os, int indent ) const {
+        os << string( indent, ' ' ) << "Catch Statement" << endl;
+
+        os << string( indent, ' ' ) << "... catching" << endl;
         if ( decl ) {
                 decl->printShort( os, indent + 4 );
                 os << endl;
         } else if ( catchRest )
-                os << "\r" << string( indent + 4 , ' ') << "the rest" << endl;
+                os << string( indent + 4 , ' ' ) << "the rest" << endl;
         else
-                os << "\r" << string( indent + 4 , ' ') << ">>> Error:  this catch clause must have a declaration <<<" << endl;
+                os << string( indent + 4 , ' ' ) << ">>> Error:  this catch clause must have a declaration <<<" << endl;
 }
 
@@ -284 +293 @@
 }
 
-void FinallyStmt::print( std::ostream &os, int indent ) {
-        os << "\r" << string( indent, ' ') << "Finally Statement" << endl;
-        os << string( indent + 2, ' ') << "with block: " << endl;
+void FinallyStmt::print( std::ostream &os, int indent ) const {
+        os << string( indent, ' ' ) << "Finally Statement" << endl;
+        os << string( indent + 2, ' ' ) << "with block: " << endl;
         block->print( os, indent + 4 );
 }
@@ -294 +303 @@
 NullStmt::~NullStmt() {}
 
-void NullStmt::print( std::ostream &os, int indent ) {
-        os << "\r" << string( indent, ' ') << "Null Statement" << endl ;
+void NullStmt::print( std::ostream &os, int indent ) const {
+        os << string( indent, ' ' ) << "Null Statement" << endl ;
 }