Changes in src/SynTree/Statement.cc [37cdd97:e67991f]

File:

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

src/SynTree/Statement.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Mon Jan 20 16:03:00 2020
-// Update Count     : 71
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sun Sep  3 20:46:44 2017
+// Update Count     : 68
 //
 
@@ -46 +46 @@
 Statement::~Statement() {}
 
-ExprStmt::ExprStmt( Expression * expr ) : Statement(), expr( expr ) {}
-
-ExprStmt::ExprStmt( const ExprStmt & other ) : Statement( other ), expr( maybeClone( other.expr ) ) {}
+ExprStmt::ExprStmt( Expression *expr ) : Statement(), expr( expr ) {}
+
+ExprStmt::ExprStmt( const ExprStmt &other ) : Statement( other ), expr( maybeClone( other.expr ) ) {}
 
 ExprStmt::~ExprStmt() {
@@ -54 +54 @@
 }
 
-void ExprStmt::print( std::ostream & os, Indenter indent ) const {
+void ExprStmt::print( std::ostream &os, Indenter indent ) const {
         os << "Expression Statement:" << endl << indent+1;
         expr->print( os, indent+1 );
@@ -60 +60 @@
 
 
-AsmStmt::AsmStmt( bool voltile, Expression * instruction, std::list<Expression *> output, std::list<Expression *> input, std::list<ConstantExpr *> clobber, std::list<Label> gotolabels ) : Statement(), voltile( voltile ), instruction( instruction ), output( output ), input( input ), clobber( clobber ), gotolabels( gotolabels ) {}
+AsmStmt::AsmStmt( bool voltile, Expression *instruction, std::list<Expression *> output, std::list<Expression *> input, std::list<ConstantExpr *> clobber, std::list<Label> gotolabels ) : Statement(), voltile( voltile ), instruction( instruction ), output( output ), input( input ), clobber( clobber ), gotolabels( gotolabels ) {}
 
 AsmStmt::AsmStmt( const AsmStmt & other ) : Statement( other ), voltile( other.voltile ), instruction( maybeClone( other.instruction ) ), gotolabels( other.gotolabels ) {
@@ -75 +75 @@
 }
 
-void AsmStmt::print( std::ostream & os, Indenter indent ) const {
+void AsmStmt::print( std::ostream &os, Indenter indent ) const {
         os << "Assembler Statement:" << endl;
         os << indent+1 << "instruction: " << endl << indent;
@@ -96 +96 @@
 DirectiveStmt::DirectiveStmt( const std::string & directive ) : Statement(), directive( directive ) {}
 
-void DirectiveStmt::print( std::ostream & os, Indenter ) const {
+void DirectiveStmt::print( std::ostream &os, Indenter ) const {
         os << "GCC Directive:" << directive << endl;
 }
 
 
-const char * BranchStmt::brType[] = {
-        "Goto", "Break", "Continue", "Fall Through", "Fall Through Default",
-};
+const char *BranchStmt::brType[] = { "Goto", "Break", "Continue" };
 
 BranchStmt::BranchStmt( Label target, Type type ) throw ( SemanticErrorException ) :
@@ -113 +111 @@
 }
 
-BranchStmt::BranchStmt( Expression * computedTarget, Type type ) throw ( SemanticErrorException ) :
+BranchStmt::BranchStmt( Expression *computedTarget, Type type ) throw ( SemanticErrorException ) :
         Statement(), computedTarget( computedTarget ), type( type ) {
         if ( type != BranchStmt::Goto || computedTarget == nullptr ) {
@@ -120 +118 @@
 }
 
-void BranchStmt::print( std::ostream & os, Indenter indent ) const {
-        assert(type < 5);
+void BranchStmt::print( std::ostream &os, Indenter indent ) const {
         os << "Branch (" << brType[type] << ")" << endl ;
         if ( target != "" ) os << indent+1 << "with target: " << target << endl;
@@ -128 +125 @@
 }
 
-ReturnStmt::ReturnStmt( Expression * expr ) : Statement(), expr( expr ) {}
+ReturnStmt::ReturnStmt( Expression *expr ) : Statement(), expr( expr ) {}
 
 ReturnStmt::ReturnStmt( const ReturnStmt & other ) : Statement( other ), expr( maybeClone( other.expr ) ) {}
@@ -136 +133 @@
 }
 
-void ReturnStmt::print( std::ostream & os, Indenter indent ) const {
+void ReturnStmt::print( std::ostream &os, Indenter indent ) const {
         os << "Return Statement, returning: ";
         if ( expr != nullptr ) {
@@ -145 +142 @@
 }
 
-IfStmt::IfStmt( Expression * condition, Statement * thenPart, Statement * elsePart, std::list<Statement *> initialization ):
+IfStmt::IfStmt( Expression *condition, Statement *thenPart, Statement *elsePart, std::list<Statement *> initialization ):
         Statement(), condition( condition ), thenPart( thenPart ), elsePart( elsePart ), initialization( initialization ) {}
 
@@ -160 +157 @@
 }
 
-void IfStmt::print( std::ostream & os, Indenter indent ) const {
+void IfStmt::print( std::ostream &os, Indenter indent ) const {
         os << "If on condition: " << endl;
         os << indent+1;
@@ -179 +176 @@
         thenPart->print( os, indent+1 );
 
-        if ( elsePart != nullptr ) {
+        if ( elsePart != 0 ) {
                 os << indent << "... else: " << endl;
                 os << indent+1;
@@ -186 +183 @@
 }
 
-SwitchStmt::SwitchStmt( Expression * condition, const std::list<Statement *> & statements ):
+SwitchStmt::SwitchStmt( Expression * condition, const std::list<Statement *> &statements ):
         Statement(), condition( condition ), statements( statements ) {
 }
@@ -201 +198 @@
 }
 
-void SwitchStmt::print( std::ostream & os, Indenter indent ) const {
+void SwitchStmt::print( std::ostream &os, Indenter indent ) const {
         os << "Switch on condition: ";
         condition->print( os );
@@ -211 +208 @@
 }
 
-CaseStmt::CaseStmt( Expression * condition, const std::list<Statement *> & statements, bool deflt ) throw ( SemanticErrorException ) :
+CaseStmt::CaseStmt( Expression *condition, const std::list<Statement *> &statements, bool deflt ) throw ( SemanticErrorException ) :
         Statement(), condition( condition ), stmts( statements ), _isDefault( deflt ) {
-        if ( isDefault() && condition != nullptr ) SemanticError( condition, "default case with condition: " );
+        if ( isDefault() && condition != 0 ) SemanticError( condition, "default case with condition: " );
 }
 
@@ -232 +229 @@
 }
 
-void CaseStmt::print( std::ostream & os, Indenter indent ) const {
+void CaseStmt::print( std::ostream &os, Indenter indent ) const {
         if ( isDefault() ) os << indent << "Default ";
         else {
@@ -246 +243 @@
 }
 
-WhileStmt::WhileStmt( Expression * condition, Statement * body, std::list< Statement * > & initialization, bool isDoWhile ):
+WhileStmt::WhileStmt( Expression *condition, Statement *body, std::list< Statement * > & initialization, bool isDoWhile ):
         Statement(), condition( condition), body( body), initialization( initialization ), isDoWhile( isDoWhile) {
 }
@@ -259 +256 @@
 }
 
-void WhileStmt::print( std::ostream & os, Indenter indent ) const {
+void WhileStmt::print( std::ostream &os, Indenter indent ) const {
         os << "While on condition: " << endl ;
         condition->print( os, indent+1 );
@@ -265 +262 @@
         os << indent << "... with body: " << endl;
 
-        if ( body != nullptr ) body->print( os, indent+1 );
-}
-
-ForStmt::ForStmt( std::list<Statement *> initialization, Expression * condition, Expression * increment, Statement * body ):
+        if ( body != 0 ) body->print( os, indent+1 );
+}
+
+ForStmt::ForStmt( std::list<Statement *> initialization, Expression *condition, Expression *increment, Statement *body ):
         Statement(), initialization( initialization ), condition( condition ), increment( increment ), body( body ) {
 }
@@ -285 +282 @@
 }
 
-void ForStmt::print( std::ostream & os, Indenter indent ) const {
+void ForStmt::print( std::ostream &os, Indenter indent ) const {
         Statement::print( os, indent ); // print labels
 
@@ -308 +305 @@
         }
 
-        if ( body != nullptr ) {
+        if ( body != 0 ) {
                 os << "\n" << indent << "... with body: \n" << indent+1;
                 body->print( os, indent+1 );
@@ -320 +317 @@
 }
 
-ThrowStmt::ThrowStmt( const ThrowStmt & other ) :
+ThrowStmt::ThrowStmt( const ThrowStmt &other ) :
         Statement ( other ), kind( other.kind ), expr( maybeClone( other.expr ) ), target( maybeClone( other.target ) ) {
 }
@@ -329 +326 @@
 }
 
-void ThrowStmt::print( std::ostream & os, Indenter indent) const {
+void ThrowStmt::print( std::ostream &os, Indenter indent) const {
         if ( target ) os << "Non-Local ";
         os << "Throw Statement, raising: ";
@@ -339 +336 @@
 }
 
-TryStmt::TryStmt( CompoundStmt * tryBlock, std::list<CatchStmt *> & handlers, FinallyStmt * finallyBlock ) :
+TryStmt::TryStmt( CompoundStmt *tryBlock, std::list<CatchStmt *> &handlers, FinallyStmt *finallyBlock ) :
         Statement(), block( tryBlock ),  handlers( handlers ), finallyBlock( finallyBlock ) {
 }
 
-TryStmt::TryStmt( const TryStmt & other ) : Statement( other ), block( maybeClone( other.block ) ), finallyBlock( maybeClone( other.finallyBlock ) ) {
+TryStmt::TryStmt( const TryStmt &other ) : Statement( other ), block( maybeClone( other.block ) ), finallyBlock( maybeClone( other.finallyBlock ) ) {
         cloneAll( other.handlers, handlers );
 }
@@ -353 +350 @@
 }
 
-void TryStmt::print( std::ostream & os, Indenter indent ) const {
+void TryStmt::print( std::ostream &os, Indenter indent ) const {
         os << "Try Statement" << endl;
         os << indent << "... with block:" << endl << indent+1;
@@ -366 +363 @@
 
         // finally block
-        if ( finallyBlock != nullptr ) {
+        if ( finallyBlock != 0 ) {
                 os << indent << "... and finally:" << endl << indent+1;
                 finallyBlock->print( os, indent+1 );
@@ -372 +369 @@
 }
 
-CatchStmt::CatchStmt( Kind kind, Declaration * decl, Expression * cond, Statement * body ) :
+CatchStmt::CatchStmt( Kind kind, Declaration *decl, Expression *cond, Statement *body ) :
         Statement(), kind ( kind ), decl ( decl ), cond ( cond ), body( body ) {
                 assertf( decl, "Catch clause must have a declaration." );
@@ -386 +383 @@
 }
 
-void CatchStmt::print( std::ostream & os, Indenter indent ) const {
+void CatchStmt::print( std::ostream &os, Indenter indent ) const {
         os << "Catch " << ((Terminate == kind) ? "Terminate" : "Resume") << " Statement" << endl;
 
@@ -404 +401 @@
 
 
-FinallyStmt::FinallyStmt( CompoundStmt * block ) : Statement(), block( block ) {
+FinallyStmt::FinallyStmt( CompoundStmt *block ) : Statement(), block( block ) {
 }
 
@@ -414 +411 @@
 }
 
-void FinallyStmt::print( std::ostream & os, Indenter indent ) const {
+void FinallyStmt::print( std::ostream &os, Indenter indent ) const {
         os << "Finally Statement" << endl;
         os << indent << "... with block:" << endl << indent+1;
         block->print( os, indent+1 );
-}
-
-SuspendStmt::SuspendStmt( const SuspendStmt & other )
-        : Statement( other )
-        , then( maybeClone(other.then) )
-{}
-
-SuspendStmt::~SuspendStmt() {
-        delete then;
-}
-
-void SuspendStmt::print( std::ostream & os, Indenter indent ) const {
-        os << "Suspend Statement";
-        switch (type) {
-                case None     : os << " with implicit target"; break;
-                case Generator: os << " for generator"       ; break;
-                case Coroutine: os << " for coroutine"       ; break;
-        }
-        os << endl;
-        indent += 1;
-
-        if(then) {
-                os << indent << " with post statement :" << endl;
-                then->print( os, indent + 1);
-        }
 }
 
@@ -486 +458 @@
 }
 
-void WaitForStmt::print( std::ostream & os, Indenter indent ) const {
+void WaitForStmt::print( std::ostream &os, Indenter indent ) const {
         os << "Waitfor Statement" << endl;
         indent += 1;
@@ -542 +514 @@
 }
 
-void NullStmt::print( std::ostream & os, Indenter indent ) const {
+void NullStmt::print( std::ostream &os, Indenter indent ) const {
         os << "Null Statement" << endl;
         Statement::print( os, indent );
@@ -558 +530 @@
 }
 
-void ImplicitCtorDtorStmt::print( std::ostream & os, Indenter indent ) const {
+void ImplicitCtorDtorStmt::print( std::ostream &os, Indenter indent ) const {
         os << "Implicit Ctor Dtor Statement" << endl;
         os << indent << "... with Ctor/Dtor: ";