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

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 ) const {
+void Statement::print( std::ostream & os, Indenter indent ) const {
         if ( ! labels.empty() ) {
-                os << "Labels: {";
+                os << indent << "... 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 {
@@ -60 +66 @@
   cloneAll( other.input, input );
   cloneAll( other.clobber, clobber );
+}
+
+AsmStmt::~AsmStmt() {
+        delete instruction;
+        deleteAll( output );
+        deleteAll( input );
+        deleteAll( clobber );
 }
 
@@ -81 +94 @@
 
 
+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" };
 
@@ -109 +129 @@
 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: ";
@@ -124 +148 @@
         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;
 }
 
@@ -161 +192 @@
 }
 
+SwitchStmt::~SwitchStmt() {
+        delete condition;
+        // destroy statements
+        deleteAll( statements );
+}
+
 void SwitchStmt::print( std::ostream &os, Indenter indent ) const {
         os << "Switch on condition: ";
@@ -181 +218 @@
 }
 
+CaseStmt::~CaseStmt() {
+        delete condition;
+        deleteAll( stmts );
+}
+
 CaseStmt * CaseStmt::makeDefault( const std::list<Label> & labels, std::list<Statement *> stmts ) {
         CaseStmt * stmt = new CaseStmt( nullptr, stmts, true );
@@ -188 +230 @@
 
 void CaseStmt::print( std::ostream &os, Indenter indent ) const {
-        if ( isDefault() ) os << "Default ";
+        if ( isDefault() ) os << indent << "Default ";
         else {
-                os << "Case ";
+                os << indent << "Case ";
                 condition->print( os, indent );
         } // if
@@ -196 +238 @@
 
         for ( Statement * stmt : stmts ) {
+                os << indent+1;
                 stmt->print( os, indent+1 );
         }
@@ -206 +249 @@
 WhileStmt::WhileStmt( const WhileStmt & other ):
         Statement( other ), condition( maybeClone( other.condition ) ), body( maybeClone( other.body ) ), isDoWhile( other.isDoWhile ) {
+}
+
+WhileStmt::~WhileStmt() {
+        delete body;
+        delete condition;
 }
 
@@ -225 +273 @@
                 cloneAll( other.initialization, initialization );
 
+}
+
+ForStmt::~ForStmt() {
+        deleteAll( initialization );
+        delete condition;
+        delete increment;
+        delete body;
 }
 
@@ -264 +319 @@
 ThrowStmt::ThrowStmt( const ThrowStmt &other ) :
         Statement ( other ), kind( other.kind ), expr( maybeClone( other.expr ) ), target( maybeClone( other.target ) ) {
+}
+
+ThrowStmt::~ThrowStmt() {
+        delete expr;
+        delete target;
 }
 
@@ -284 +344 @@
 }
 
+TryStmt::~TryStmt() {
+        delete block;
+        deleteAll( handlers );
+        delete finallyBlock;
+}
+
 void TryStmt::print( std::ostream &os, Indenter indent ) const {
         os << "Try Statement" << endl;
@@ -312 +378 @@
 }
 
+CatchStmt::~CatchStmt() {
+        delete decl;
+        delete body;
+}
+
 void CatchStmt::print( std::ostream &os, Indenter indent ) const {
         os << "Catch " << ((Terminate == kind) ? "Terminate" : "Resume") << " Statement" << endl;
@@ -334 +405 @@
 
 FinallyStmt::FinallyStmt( const FinallyStmt & other ) : Statement( other ), block( maybeClone( other.block ) ) {
+}
+
+FinallyStmt::~FinallyStmt() {
+        delete block;
 }
 
@@ -367 +442 @@
 }
 
+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;
-        os << indent << "... with block:" << endl << indent+1;
-        // block->print( os, indent + 4 );
+        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); }
 }
 
@@ -377 +496 @@
 WithStmt::WithStmt( const WithStmt & other ) : Statement( other ), stmt( maybeClone( other.stmt ) ) {
         cloneAll( other.exprs, exprs );
+}
+WithStmt::~WithStmt() {
+        deleteAll( exprs );
+        delete stmt;
 }
 
@@ -391 +514 @@
 }
 
-void NullStmt::print( std::ostream &os, Indenter ) const {
+void NullStmt::print( std::ostream &os, Indenter indent ) const {
         os << "Null Statement" << endl;
+        Statement::print( os, indent );
 }
 
@@ -400 +524 @@
 
 ImplicitCtorDtorStmt::ImplicitCtorDtorStmt( const ImplicitCtorDtorStmt & other ) : Statement( other ), callStmt( maybeClone( other.callStmt ) ) {
+}
+
+ImplicitCtorDtorStmt::~ImplicitCtorDtorStmt() {
+        delete callStmt;
 }