Changes in src/Parser/StatementNode.cc [843054c2:59db689]

File:

• src/Parser/StatementNode.cc (modified) (19 diffs)

src/Parser/StatementNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 14:59:41 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat May 16 15:10:45 2015
-// Update Count     : 7
+// Last Modified On : Sat Jun  6 23:25:41 2015
+// Update Count     : 19
 //
 
@@ -36 +36 @@
 StatementNode::StatementNode() : ParseNode(), control( 0 ), block( 0 ), labels( 0 ), target( 0 ), decl( 0 ), isCatchRest ( false ) {}
 
-StatementNode::StatementNode( string name_) : ParseNode( name_), control( 0 ), block( 0 ), labels( 0 ), target( 0 ), decl( 0 ), isCatchRest ( false ) {}
+StatementNode::StatementNode( const string *name_ ) : ParseNode( name_ ), control( 0 ), block( 0 ), labels( 0 ), target( 0 ), decl( 0 ), isCatchRest ( false ) {}
 
 StatementNode::StatementNode( DeclarationNode *decl ) : type( Decl ), control( 0 ), block( 0 ), labels( 0 ), target( 0 ), isCatchRest ( false ) {
@@ -49 +49 @@
                                 next->set_next( new StatementNode( dynamic_cast< DeclarationNode* >( decl->get_link() ) ) );
                                 decl->set_next( 0 );
-                        }
+                        } // if
                 } else {
                         if ( decl->get_link() ) {
                                 next = new StatementNode( dynamic_cast< DeclarationNode* >( decl->get_link() ) );
                                 decl->set_next( 0 );
-                        }
+                        } // if
                         this->decl = decl;
-                }
-        }
+                } // if
+        } // if
 }
 
@@ -67 +67 @@
 
 StatementNode::StatementNode( Type t, string *_target ) :
-                type( t ), control( 0 ), block( 0 ),   labels( 0 ), target(_target ), decl( 0 ), isCatchRest ( false ) {}
+                type( t ), control( 0 ), block( 0 ), labels( 0 ), target(_target ), decl( 0 ), isCatchRest ( false ) {}
 
 StatementNode::~StatementNode() {
@@ -98 +98 @@
         } else {
                 newnode->target = 0;
-        }
+        } // if
         newnode->decl = maybeClone( decl );
         return newnode;
@@ -125 +125 @@
 }
 
-StatementNode *StatementNode::add_label( std::string *l ) {
+StatementNode *StatementNode::add_label( const std::string *l ) {
         if ( l != 0 ) {
                 if ( labels == 0 )
@@ -132 +132 @@
                 labels->push_front(*l ); 
                 delete l;
-        }
+        } // if
         return this;
 }
@@ -151 +151 @@
                 else
                         block->set_link( stmt );
-        }
+        } // if
         return this;
 }
@@ -165 +165 @@
                         else
                                 block->set_link( stmt );
-        }
+        } // if
         return this;
 }
 
 void StatementNode::print( std::ostream &os, int indent ) const {
-        if ( labels != 0 )
+        if ( labels != 0 ) {
                 if ( ! labels->empty()) {
                         std::list<std::string>::const_iterator i;
 
-                        os << '\r' << string( indent, ' ');
+                        os << string( indent, ' ' );
                         for ( i = labels->begin(); i != labels->end(); i++ )
                                 os << *i << ":";
                         os << endl;
-                }
+                } // if
+        } // if
 
         switch ( type ) {
@@ -193 +194 @@
                 break;
           default:
-                os << '\r' << string( indent, ' ') << StatementNode::StType[type] << endl;
+                os << string( indent, ' ' ) << StatementNode::StType[type] << endl;
                 if ( type == Catch ) {
                         if ( decl ) {
-                                os << '\r' << string( indent + ParseNode::indent_by, ' ' ) << "Declaration: " << endl;
+                                os << string( indent + ParseNode::indent_by, ' ' ) << "Declaration: " << endl;
                                 decl->print( os, indent + 2*ParseNode::indent_by );
                         } else if ( isCatchRest ) {
-                                os << '\r' << string( indent + ParseNode::indent_by, ' ' ) << "Catches the rest " << endl;
+                                os << string( indent + ParseNode::indent_by, ' ' ) << "Catches the rest " << endl;
                         } else {
                                 ; // should never reach here
-                        }
-                }
+                        } // if
+                } // if
                 if ( control ) {
-                        os << '\r' << string( indent + ParseNode::indent_by, ' ' ) << "Expression: " << endl;
+                        os << string( indent + ParseNode::indent_by, ' ' ) << "Expression: " << endl;
                         control->printList( os, indent + 2*ParseNode::indent_by );
-                }
+                } // if
                 if ( block ) {
-                        os << '\r' << string( indent + ParseNode::indent_by, ' ' ) << "Branches of execution: " << endl;
+                        os << string( indent + ParseNode::indent_by, ' ' ) << "Branches of execution: " << endl;
                         block->printList( os, indent + 2*ParseNode::indent_by );  
-                }
+                } // if
                 if ( target ) {
-                        os << '\r' << string( indent + ParseNode::indent_by, ' ' ) << "Target: " << get_target() << endl;
-                }
+                        os << string( indent + ParseNode::indent_by, ' ' ) << "Target: " << get_target() << endl;
+                } // if
                 break;
-        }
+        } // switch
 }
 
@@ -227 +228 @@
                 std::back_insert_iterator< std::list<Label> > lab_it( labs );
                 copy( labels->begin(), labels->end(), lab_it );
-        }
+        } // if
 
         // try {
@@ -254 +255 @@
                                 elseb = branches.front();
                                 branches.pop_front();
-                        }
+                        } // if
                         return new IfStmt( labs, notZeroExpr( get_control()->build() ), thenb, elseb );
                 }
@@ -299 +300 @@
                                 assert( get_control() != 0 );
                                 return new BranchStmt( labs, get_control()->build(), BranchStmt::Goto );
-                        }
+                        } // if
 
                         return new BranchStmt( labs, get_target(), BranchStmt::Goto );
@@ -322 +323 @@
                         if ( ( finallyBlock = dynamic_cast<FinallyStmt *>( branches.back())) ) {
                                 branches.pop_back();
-                        }
+                        } // if
                         return new TryStmt( labs, tryBlock, branches, finallyBlock );
                 }
@@ -342 +343 @@
                 // shouldn't be here
                 return 0;
-        }
-}
-
-CompoundStmtNode::CompoundStmtNode() : first( 0 ), last( 0 ) {
-}
-
-CompoundStmtNode::CompoundStmtNode( string *name_) : StatementNode(*name_), first( 0 ), last( 0 ) {
-}
-
-CompoundStmtNode::CompoundStmtNode( StatementNode *stmt ): first( stmt ) {
+        } // switch
+}
+
+CompoundStmtNode::CompoundStmtNode() : first( 0 ), last( 0 ) {}
+
+CompoundStmtNode::CompoundStmtNode( const string *name_ ) : StatementNode( name_ ), first( 0 ), last( 0 ) {}
+
+CompoundStmtNode::CompoundStmtNode( StatementNode *stmt ) : first( stmt ) {
         if ( first ) {
                 last = ( StatementNode *)( stmt->get_last());
         } else {
                 last = 0;
-        }
+        } // if
 }
 
@@ -367 +366 @@
                 last->set_link( stmt );
                 last = ( StatementNode *)( stmt->get_link());
-        }
+        } // if
 }
 
@@ -373 +372 @@
         if ( first ) {
                 first->printList( os, indent+2 );
-        }
+        } // if
 }
 
@@ -383 +382 @@
                 std::back_insert_iterator< std::list<Label> > lab_it( labs );
                 copy( labels->begin(), labels->end(), lab_it );
-        }
+        } // if
 
         CompoundStmt *cs = new CompoundStmt( labs );
@@ -391 +390 @@
 
 void NullStmtNode::print( ostream &os, int indent ) const {
-        os << "\r" << string( indent, ' ') << "Null Statement:" << endl;
+        os << string( indent, ' ' ) << "Null Statement:" << endl;
 }