Changeset de62360d for src/SynTree/Statement.cc

Timestamp:

Jun 24, 2015, 4:04:19 PM (9 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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, string, with_gc

Children:

94e0864d

Parents:

a1d5d2a

Message:

fix computed goto, fixed -std=, implicit typedefs for enum and aggregates, add _Noreturn _Thread_local

File:

• src/SynTree/Statement.cc (modified) (20 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 : Fri Jun  5 07:51:04 2015
-// Update Count     : 15
+// 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 ) {
+void ExprStmt::print( std::ostream &os, int indent ) const {
         os << string( indent, ' ' ) << "Expression Statement:" << endl;
         expr->print( os, indent + 2 );
@@ -58 +58 @@
 }
 
-void BranchStmt::print( std::ostream &os, int indent ) {
+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 ) {
+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 );
@@ -79 +79 @@
 IfStmt::~IfStmt() {}
 
-void IfStmt::print( std::ostream &os, int indent ) {
+void IfStmt::print( std::ostream &os, int indent ) const {
         os << string( indent, ' ' ) << "If on condition: " << endl ;
         condition->print( os, indent + 4 );
@@ -103 +103 @@
 void SwitchStmt::add_case( CaseStmt *c ) {}
 
-void SwitchStmt::print( std::ostream &os, int indent ) {
+void SwitchStmt::print( std::ostream &os, int indent ) const {
         os << string( indent, ' ' ) << "Switch on condition: ";
         condition->print( os );
@@ -109 +109 @@
 
         // 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 ));
@@ -130 +130 @@
 }
 
-void CaseStmt::print( std::ostream &os, int indent ) {
+void CaseStmt::print( std::ostream &os, int indent ) const {
         os << string( indent, ' ' );
 
-        if ( isDefault())
+        if ( isDefault() )
                 os << "Default ";
         else {
@@ -142 +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 );
@@ -158 +158 @@
 void ChooseStmt::add_case( CaseStmt *c ) {}
 
-void ChooseStmt::print( std::ostream &os, int indent ) {
+void ChooseStmt::print( std::ostream &os, int indent ) const {
         os << string( indent, ' ' ) << "Choose on condition: ";
         condition->print( os );
@@ -164 +164 @@
 
         // 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 );
@@ -171 +171 @@
 }
 
-void FallthruStmt::print( std::ostream &os, int indent ) {
+void FallthruStmt::print( std::ostream &os, int indent ) const {
         os << string( indent, ' ' ) << "Fall-through statement" << endl;
 }
@@ -183 +183 @@
 }
 
-void WhileStmt::print( std::ostream &os, int indent ) {
+void WhileStmt::print( std::ostream &os, int indent ) const {
         os << string( indent, ' ' ) << "While on condition: " << endl ;
         condition->print( os, indent + 4 );
@@ -203 +203 @@
 }
 
-void ForStmt::print( std::ostream &os, int indent ) {
+void ForStmt::print( std::ostream &os, int indent ) const {
         os << string( indent, ' ' ) << "Labels: {";
-        for (std::list<Label>::iterator it = get_labels().begin(); it != get_labels().end(); ++it) {
+        for ( std::list<Label>::const_iterator it = get_labels().begin(); it != get_labels().end(); ++it) {
                 os << *it << ",";
         }
@@ -245 +245 @@
 }
 
-void TryStmt::print( std::ostream &os, int indent ) {
+void TryStmt::print( std::ostream &os, int indent ) const {
         os << string( indent, ' ' ) << "Try Statement" << endl;
         os << string( indent + 2, ' ' ) << "with block: " << endl;
@@ -252 +252 @@
         // handlers
         os << string( indent + 2, ' ' ) << "and handlers: " << endl;
-        std::list<Statement *>::iterator i;
-        for ( i = handlers.begin(); i != handlers.end(); i++)
+        for ( std::list<Statement *>::const_iterator i = handlers.begin(); i != handlers.end(); i++)
                 (*i )->print( os, indent + 4 );
 
@@ -272 +271 @@
 }
 
-void CatchStmt::print( std::ostream &os, int indent ) {
+void CatchStmt::print( std::ostream &os, int indent ) const {
         os << string( indent, ' ' ) << "Catch Statement" << endl;
 
@@ -294 +293 @@
 }
 
-void FinallyStmt::print( std::ostream &os, int indent ) {
+void FinallyStmt::print( std::ostream &os, int indent ) const {
         os << string( indent, ' ' ) << "Finally Statement" << endl;
         os << string( indent + 2, ' ' ) << "with block: " << endl;
@@ -304 +303 @@
 NullStmt::~NullStmt() {}
 
-void NullStmt::print( std::ostream &os, int indent ) {
+void NullStmt::print( std::ostream &os, int indent ) const {
         os << string( indent, ' ' ) << "Null Statement" << endl ;
 }