Changes in src/SynTree/Statement.cc [cc32d83:68f9c43]

File:

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

src/SynTree/Statement.cc

@@ -34 +34 @@
 Statement::Statement( const std::list<Label> & labels ) : labels( labels ) {}
 
-void Statement::print( std::ostream & os, Indenter indent ) const {
+void Statement::print( std::ostream & os, Indenter ) const {
         if ( ! labels.empty() ) {
-                os << indent << "... Labels: {";
+                os << "Labels: {";
                 for ( const Label & l : labels ) {
                         os << l << ",";
@@ -44 +44 @@
 }
 
-Statement::~Statement() {}
-
 ExprStmt::ExprStmt( Expression *expr ) : Statement(), expr( expr ) {}
 
 ExprStmt::ExprStmt( const ExprStmt &other ) : Statement( other ), expr( maybeClone( other.expr ) ) {}
-
-ExprStmt::~ExprStmt() {
-        delete expr;
-}
 
 void ExprStmt::print( std::ostream &os, Indenter indent ) const {
@@ -66 +60 @@
   cloneAll( other.input, input );
   cloneAll( other.clobber, clobber );
-}
-
-AsmStmt::~AsmStmt() {
-        delete instruction;
-        deleteAll( output );
-        deleteAll( input );
-        deleteAll( clobber );
 }
 
@@ -94 +81 @@
 
 
-DirectiveStmt::DirectiveStmt( const std::string & directive ) : Statement(), directive( directive ) {}
-
-void DirectiveStmt::print( std::ostream &os, Indenter ) const {
-        os << "GCC Directive:" << directive << endl;
-}
-
-
 const char *BranchStmt::brType[] = { "Goto", "Break", "Continue" };
 
@@ -129 +109 @@
 ReturnStmt::ReturnStmt( const ReturnStmt & other ) : Statement( other ), expr( maybeClone( other.expr ) ) {}
 
-ReturnStmt::~ReturnStmt() {
-        delete expr;
-}
-
 void ReturnStmt::print( std::ostream &os, Indenter indent ) const {
         os << "Return Statement, returning: ";
@@ -148 +124 @@
         Statement( other ), condition( maybeClone( other.condition ) ), thenPart( maybeClone( other.thenPart ) ), elsePart( maybeClone( other.elsePart ) ) {
         cloneAll( other.initialization, initialization );
-}
-
-IfStmt::~IfStmt() {
-        deleteAll( initialization );
-        delete condition;
-        delete thenPart;
-        delete elsePart;
 }
 
@@ -192 +161 @@
 }
 
-SwitchStmt::~SwitchStmt() {
-        delete condition;
-        // destroy statements
-        deleteAll( statements );
-}
-
 void SwitchStmt::print( std::ostream &os, Indenter indent ) const {
         os << "Switch on condition: ";
@@ -216 +179 @@
         Statement( other ), condition( maybeClone(other.condition ) ), _isDefault( other._isDefault ) {
         cloneAll( other.stmts, stmts );
-}
-
-CaseStmt::~CaseStmt() {
-        delete condition;
-        deleteAll( stmts );
 }
 
@@ -230 +188 @@
 
 void CaseStmt::print( std::ostream &os, Indenter indent ) const {
-        if ( isDefault() ) os << indent << "Default ";
+        if ( isDefault() ) os << "Default ";
         else {
-                os << indent << "Case ";
+                os << "Case ";
                 condition->print( os, indent );
         } // if
@@ -238 +196 @@
 
         for ( Statement * stmt : stmts ) {
-                os << indent+1;
                 stmt->print( os, indent+1 );
         }
@@ -249 +206 @@
 WhileStmt::WhileStmt( const WhileStmt & other ):
         Statement( other ), condition( maybeClone( other.condition ) ), body( maybeClone( other.body ) ), isDoWhile( other.isDoWhile ) {
-}
-
-WhileStmt::~WhileStmt() {
-        delete body;
-        delete condition;
 }
 
@@ -273 +225 @@
                 cloneAll( other.initialization, initialization );
 
-}
-
-ForStmt::~ForStmt() {
-        deleteAll( initialization );
-        delete condition;
-        delete increment;
-        delete body;
 }
 
@@ -319 +264 @@
 ThrowStmt::ThrowStmt( const ThrowStmt &other ) :
         Statement ( other ), kind( other.kind ), expr( maybeClone( other.expr ) ), target( maybeClone( other.target ) ) {
-}
-
-ThrowStmt::~ThrowStmt() {
-        delete expr;
-        delete target;
 }
 
@@ -344 +284 @@
 }
 
-TryStmt::~TryStmt() {
-        delete block;
-        deleteAll( handlers );
-        delete finallyBlock;
-}
-
 void TryStmt::print( std::ostream &os, Indenter indent ) const {
         os << "Try Statement" << endl;
@@ -378 +312 @@
 }
 
-CatchStmt::~CatchStmt() {
-        delete decl;
-        delete body;
-}
-
 void CatchStmt::print( std::ostream &os, Indenter indent ) const {
         os << "Catch " << ((Terminate == kind) ? "Terminate" : "Resume") << " Statement" << endl;
@@ -405 +334 @@
 
 FinallyStmt::FinallyStmt( const FinallyStmt & other ) : Statement( other ), block( maybeClone( other.block ) ) {
-}
-
-FinallyStmt::~FinallyStmt() {
-        delete block;
 }
 
@@ -442 +367 @@
 }
 
-WaitForStmt::~WaitForStmt() {
-        for( auto & clause : clauses ) {
-                delete clause.target.function;
-                deleteAll( clause.target.arguments );
-                delete clause.statement;
-                delete clause.condition;
-        }
-
-        delete timeout.time;
-        delete timeout.statement;
-        delete timeout.condition;
-
-        delete orelse.statement;
-        delete orelse.condition;
-}
-
 void WaitForStmt::print( std::ostream &os, Indenter indent ) const {
         os << "Waitfor Statement" << endl;
-        indent += 1;
-        for( auto & clause : clauses ) {
-                os << indent << "target function :";
-                if(clause.target.function) { clause.target.function->print(os, indent + 1); }
-                os << endl << indent << "with arguments :" << endl;
-                for( auto & thing : clause.target.arguments) {
-                        if(thing) { thing->print(os, indent + 1); }
-                }
-                os << indent << " with statment :" << endl;
-                if(clause.statement) { clause.statement->print(os, indent + 1); }
-
-                os << indent << " with condition :" << endl;
-                if(clause.condition) { clause.condition->print(os, indent + 1); }
-        }
-
-        os << indent << " timeout of :" << endl;
-        if(timeout.time) { timeout.time->print(os, indent + 1); }
-
-        os << indent << " with statment :" << endl;
-        if(timeout.statement) { timeout.statement->print(os, indent + 1); }
-
-        os << indent << " with condition :" << endl;
-        if(timeout.condition) { timeout.condition->print(os, indent + 1); }
-
-
-        os << indent << " else :" << endl;
-        if(orelse.statement) { orelse.statement->print(os, indent + 1); }
-
-        os << indent << " with condition :" << endl;
-        if(orelse.condition) { orelse.condition->print(os, indent + 1); }
+        os << indent << "... with block:" << endl << indent+1;
+        // block->print( os, indent + 4 );
 }
 
@@ -496 +377 @@
 WithStmt::WithStmt( const WithStmt & other ) : Statement( other ), stmt( maybeClone( other.stmt ) ) {
         cloneAll( other.exprs, exprs );
-}
-WithStmt::~WithStmt() {
-        deleteAll( exprs );
-        delete stmt;
 }
 
@@ -514 +391 @@
 }
 
-void NullStmt::print( std::ostream &os, Indenter indent ) const {
+void NullStmt::print( std::ostream &os, Indenter ) const {
         os << "Null Statement" << endl;
-        Statement::print( os, indent );
 }
 
@@ -524 +400 @@
 
 ImplicitCtorDtorStmt::ImplicitCtorDtorStmt( const ImplicitCtorDtorStmt & other ) : Statement( other ), callStmt( maybeClone( other.callStmt ) ) {
-}
-
-ImplicitCtorDtorStmt::~ImplicitCtorDtorStmt() {
-        delete callStmt;
 }