Changeset 68f9c43 for src/SynTree/Statement.cc

Timestamp:

Mar 16, 2018, 5:15:02 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

new-env, with_gc

Children:

8d7bef2

Parents:

6171841

git-author:

Aaron Moss <a3moss@…> (03/16/18 17:04:24)

git-committer:

Aaron Moss <a3moss@…> (03/16/18 17:15:02)

Message:

First pass at delete removal

File:

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

src/SynTree/Statement.cc

@@ -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 );
 }
 
@@ -122 +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: ";
@@ -141 +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;
 }
 
@@ -185 +161 @@
 }
 
-SwitchStmt::~SwitchStmt() {
-        delete condition;
-        // destroy statements
-        deleteAll( statements );
-}
-
 void SwitchStmt::print( std::ostream &os, Indenter indent ) const {
         os << "Switch on condition: ";
@@ -209 +179 @@
         Statement( other ), condition( maybeClone(other.condition ) ), _isDefault( other._isDefault ) {
         cloneAll( other.stmts, stmts );
-}
-
-CaseStmt::~CaseStmt() {
-        delete condition;
-        deleteAll( stmts );
 }
 
@@ -243 +208 @@
 }
 
-WhileStmt::~WhileStmt() {
-        delete body;
-        delete condition;
-}
-
 void WhileStmt::print( std::ostream &os, Indenter indent ) const {
         os << "While on condition: " << endl ;
@@ -265 +225 @@
                 cloneAll( other.initialization, initialization );
 
-}
-
-ForStmt::~ForStmt() {
-        deleteAll( initialization );
-        delete condition;
-        delete increment;
-        delete body;
 }
 
@@ -311 +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;
 }
 
@@ -336 +284 @@
 }
 
-TryStmt::~TryStmt() {
-        delete block;
-        deleteAll( handlers );
-        delete finallyBlock;
-}
-
 void TryStmt::print( std::ostream &os, Indenter indent ) const {
         os << "Try Statement" << endl;
@@ -370 +312 @@
 }
 
-CatchStmt::~CatchStmt() {
-        delete decl;
-        delete body;
-}
-
 void CatchStmt::print( std::ostream &os, Indenter indent ) const {
         os << "Catch " << ((Terminate == kind) ? "Terminate" : "Resume") << " Statement" << endl;
@@ -397 +334 @@
 
 FinallyStmt::FinallyStmt( const FinallyStmt & other ) : Statement( other ), block( maybeClone( other.block ) ) {
-}
-
-FinallyStmt::~FinallyStmt() {
-        delete block;
 }
 
@@ -434 +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;
@@ -460 +377 @@
 WithStmt::WithStmt( const WithStmt & other ) : Statement( other ), stmt( maybeClone( other.stmt ) ) {
         cloneAll( other.exprs, exprs );
-}
-WithStmt::~WithStmt() {
-        deleteAll( exprs );
-        delete stmt;
 }
 
@@ -489 +402 @@
 }
 
-ImplicitCtorDtorStmt::~ImplicitCtorDtorStmt() {
-        delete callStmt;
-}
-
 void ImplicitCtorDtorStmt::print( std::ostream &os, Indenter indent ) const {
         os << "Implicit Ctor Dtor Statement" << endl;