Changes in src/SynTree/Statement.cc [8688ce1:7f5566b]

File:

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

src/SynTree/Statement.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Statement.cc --
+// Statement.cc -- 
 //
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Aug  4 11:25:20 2016
-// Update Count     : 61
+// Last Modified On : Sat Jul 25 12:19:50 2015
+// Update Count     : 53
 //
 
@@ -36 +36 @@
 ExprStmt::ExprStmt( std::list<Label> _labels, Expression *_expr ) : Statement( _labels ), expr( _expr ) {}
 
-ExprStmt::ExprStmt( const ExprStmt &other ) : Statement( other ), expr( maybeClone( other.expr ) ) {}
-
-ExprStmt::~ExprStmt() {
-        delete expr;
-}
+ExprStmt::~ExprStmt() {}
 
 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 );
-}
+} 
 
 
 AsmStmt::AsmStmt( std::list<Label> labels, bool voltile, ConstantExpr *instruction, std::list<Expression *> output, std::list<Expression *> input, std::list<ConstantExpr *> clobber, std::list<Label> gotolabels ) : Statement( labels ), 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 ) {
-  cloneAll( other.output, output );
-  cloneAll( other.input, input );
-  cloneAll( other.clobber, clobber );
-}
 
 AsmStmt::~AsmStmt() {
@@ -70 +60 @@
                 os << endl << std::string( indent, ' ' ) << "output: " << endl;
                 printAll( output, os, indent + 2 );
-        } // if
+        } // if 
         if ( ! input.empty() ) {
                 os << std::string( indent, ' ' ) << "input: " << endl << std::string( indent, ' ' );
@@ -79 +69 @@
                 printAll( clobber, os, indent + 2 );
         } // if
-}
+} 
 
 
@@ -87 +77 @@
         Statement( labels ), originalTarget( _target ), target( _target ), computedTarget( NULL ), type( _type ) {
         //actually this is a syntactic error signaled by the parser
-        if ( type == BranchStmt::Goto && target.empty() )
+        if ( type == BranchStmt::Goto && target.size() == 0 )
                 throw SemanticError("goto without target");
 }
@@ -103 +93 @@
 ReturnStmt::ReturnStmt( std::list<Label> labels, Expression *_expr, bool throwP ) : Statement( labels ), expr( _expr ), isThrow( throwP ) {}
 
-ReturnStmt::ReturnStmt( const ReturnStmt & other ) : Statement( other ), expr( maybeClone( other.expr ) ), isThrow( other.isThrow ) {}
-
 ReturnStmt::~ReturnStmt() {
         delete expr;
@@ -110 +98 @@
 
 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;
 }
@@ -121 +106 @@
         Statement( _labels ), condition( _condition ), thenPart( _thenPart ), elsePart( _elsePart ) {}
 
-IfStmt::IfStmt( const IfStmt & other ) :
-        Statement( other ), condition( maybeClone( other.condition ) ), thenPart( maybeClone( other.thenPart ) ), elsePart( maybeClone( other.elsePart ) ) {}
-
 IfStmt::~IfStmt() {}
 
 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
 }
 
-SwitchStmt::SwitchStmt( std::list<Label> _labels, Expression * _condition, std::list<Statement *> &_statements ):
-        Statement( _labels ), condition( _condition ), statements( _statements ) {
-}
-
-SwitchStmt::SwitchStmt( const SwitchStmt & other ):
-        Statement( other ), condition( maybeClone( other.condition ) ) {
-        cloneAll( other.statements, statements );
+SwitchStmt::SwitchStmt( std::list<Label> _labels, Expression * _condition, std::list<Statement *> &_branches ):
+        Statement( _labels ), condition( _condition ), branches( _branches ) {
 }
 
 SwitchStmt::~SwitchStmt() {
         delete condition;
-        // destroy statements
-}
+        // destroy branches
+}
+
+void SwitchStmt::add_case( CaseStmt *c ) {}
 
 void SwitchStmt::print( std::ostream &os, int indent ) const {
-        os << "Switch on condition: ";
+        os << string( indent, ' ' ) << "Switch on condition: ";
         condition->print( os );
         os << endl;
 
-        // statements
+        // branches
         std::list<Statement *>::const_iterator i;
-        for ( i = statements.begin(); i != statements.end(); i++)
+        for ( i = branches.begin(); i != branches.end(); i++)
                 (*i)->print( os, indent + 4 );
 
-        //for_each( statements.begin(), statements.end(), mem_fun( bind1st(&Statement::print ), os ));
-}
-
-CaseStmt::CaseStmt( std::list<Label> _labels, Expression *_condition, std::list<Statement *> &_statements, bool deflt ) throw ( SemanticError ) :
+        //for_each( branches.begin(), branches.end(), mem_fun( bind1st(&Statement::print ), os ));
+}
+
+CaseStmt::CaseStmt( std::list<Label> _labels, Expression *_condition, std::list<Statement *> &_statements, bool deflt ) throw ( SemanticError ) : 
         Statement( _labels ), condition( _condition ), stmts( _statements ), _isDefault( deflt ) {
         if ( isDefault() && condition != 0 )
@@ -176 +151 @@
 }
 
-CaseStmt::CaseStmt( const CaseStmt & other ) :
-        Statement( other ), condition( maybeClone(other.condition ) ), _isDefault( other._isDefault ) {
-        cloneAll( other.stmts, stmts );
-}
-
 CaseStmt::~CaseStmt() {
         delete condition;
 }
 
-CaseStmt * CaseStmt::makeDefault( std::list<Label> labels, std::list<Statement *> stmts ) {
-        return new CaseStmt( labels, 0, stmts, true );
+CaseStmt * CaseStmt::makeDefault( std::list<Label> labels, std::list<Statement *> branches ) {
+        return new CaseStmt( labels, 0, branches, true );
 }
 
@@ -206 +176 @@
 }
 
+//ChooseStmt::ChooseStmt( std::list<Label> labels, Expression *condition, Statement *body ) {}
+ChooseStmt::ChooseStmt( std::list<Label> _labels, Expression * _condition, std::list<Statement *> &_branches ):
+        Statement( _labels ), condition( _condition ), branches( _branches ) {
+}
+
+ChooseStmt::~ChooseStmt() {
+        delete condition;
+}
+
+void ChooseStmt::add_case( CaseStmt *c ) {}
+
+void ChooseStmt::print( std::ostream &os, int indent ) const {
+        os << string( indent, ' ' ) << "Choose on condition: ";
+        condition->print( os );
+        os << endl;
+
+        // branches
+        std::list<Statement *>::const_iterator i;
+        for ( i = branches.begin(); i != branches.end(); i++)
+                (*i )->print( os, indent + 4 );
+
+        //for_each( branches.begin(), branches.end(), mem_fun( bind1st(&Statement::print ), os ));
+}
+
+void FallthruStmt::print( std::ostream &os, int indent ) const {
+        os << string( indent, ' ' ) << "Fall-through statement" << endl;
+}
+
 WhileStmt::WhileStmt( std::list<Label> labels, Expression *condition_, Statement *body_, bool isDoWhile_ ):
         Statement( labels ), condition( condition_), body( body_), isDoWhile( isDoWhile_) {
 }
 
-WhileStmt::WhileStmt( const WhileStmt & other ):
-        Statement( other ), condition( maybeClone( other.condition ) ), body( maybeClone( other.body ) ), isDoWhile( other.isDoWhile ) {
-}
-
 WhileStmt::~WhileStmt() {
         delete body;
@@ -219 +213 @@
 
 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 );
 
@@ -229 +223 @@
 ForStmt::ForStmt( std::list<Label> labels, std::list<Statement *> initialization_, Expression *condition_, Expression *increment_, Statement *body_ ):
         Statement( labels ), initialization( initialization_ ), condition( condition_ ), increment( increment_ ), body( body_ ) {
-}
-
-ForStmt::ForStmt( const ForStmt & other ):
-        Statement( other ), condition( maybeClone( other.condition ) ), increment( maybeClone( other.increment ) ), body( maybeClone( other.body ) ) {
-                cloneAll( other.initialization, initialization );
-
 }
 
@@ -245 +233 @@
 
 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 << ",";
@@ -253 +241 @@
         os << string( indent, ' ' ) << "For Statement" << endl ;
 
-        os << string( indent + 2, ' ' ) << "initialization: \n";
+        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, ' ' );
+        os << "\n" << string( indent + 2, ' ' ) << "condition: \n"; 
+        if ( condition != 0 )
                 condition->print( os, indent + 4 );
-        }
-
-        os << "\n" << string( indent + 2, ' ' ) << "increment: \n";
-        if ( increment != 0 ) {
-                os << string( indent + 4, ' ' );
+
+        os << "\n" << string( indent + 2, ' ' ) << "increment: \n"; 
+        if ( increment != 0 )
                 increment->print( os, indent + 4 );
-        }
-
-        os << "\n" << string( indent + 2, ' ' ) << "statement block: \n";
-        if ( body != 0 ) {
-                os << string( indent + 4, ' ' );
+
+        os << "\n" << string( indent + 2, ' ' ) << "statement block: \n"; 
+        if ( body != 0 )
                 body->print( os, indent + 4 );
-        }
 
         os << endl;
@@ -284 +265 @@
 }
 
-TryStmt::TryStmt( const TryStmt &other ) : Statement( other ), block( maybeClone( other.block ) ), finallyBlock( maybeClone( other.finallyBlock ) ) {
-        cloneAll( other.handlers, handlers );
+TryStmt::TryStmt( const TryStmt &other ) : Statement( other.labels ) {
+        block = other.block;
+        std::copy( other.handlers.begin(), other.handlers.end(), back_inserter( handlers ) );
+        finallyBlock = other.finallyBlock;
 }
 
@@ -293 +276 @@
 
 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 );
@@ -313 +296 @@
 }
 
-CatchStmt::CatchStmt( const CatchStmt & other ) :
-        Statement( other ), decl ( maybeClone( other.decl ) ), body( maybeClone( other.body ) ), catchRest ( other.catchRest ) {
-}
-
 CatchStmt::~CatchStmt() {
         delete decl;
@@ -323 +302 @@
 
 void CatchStmt::print( std::ostream &os, int indent ) const {
-        os << "Catch Statement" << endl;
+        os << string( indent, ' ' ) << "Catch Statement" << endl;
 
         os << string( indent, ' ' ) << "... catching" << endl;
@@ -340 +319 @@
 }
 
-FinallyStmt::FinallyStmt( const FinallyStmt & other ) : Statement( other ), block( maybeClone( other.block ) ) {
-}
-
 FinallyStmt::~FinallyStmt() {
         delete block;
@@ -348 +324 @@
 
 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 );
@@ -355 +331 @@
 NullStmt::NullStmt( std::list<Label> labels ) : CompoundStmt( labels ) {}
 NullStmt::NullStmt() : CompoundStmt( std::list<Label>() ) {}
+NullStmt::~NullStmt() {}
 
 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;
-}
-
-std::ostream & operator<<( std::ostream & out, Statement * statement ) {
-        statement->print( out );
-        return out;
+        os << string( indent, ' ' ) << "Null Statement" << endl ;
 }