Changeset 6943a987 for src/SynTree/Statement.cc

Timestamp:

Aug 29, 2016, 10:33:05 AM (9 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

5e644d3e

Parents:

79841be (diff), 413ad05 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

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

src/SynTree/Statement.cc

@@ -10 +10 @@
 // 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 : Fri Aug 12 13:58:48 2016
+// Update Count     : 62
 //
 
@@ -124 +124 @@
         Statement( other ), condition( maybeClone( other.condition ) ), thenPart( maybeClone( other.thenPart ) ), elsePart( maybeClone( other.elsePart ) ) {}
 
-IfStmt::~IfStmt() {}
+IfStmt::~IfStmt() {
+        delete condition;
+        delete thenPart;
+        delete elsePart;
+}
 
 void IfStmt::print( std::ostream &os, int indent ) const {
@@ -155 +159 @@
         delete condition;
         // destroy statements
+        deleteAll( statements );
 }
 
@@ -183 +188 @@
 CaseStmt::~CaseStmt() {
         delete condition;
+        deleteAll( stmts );
 }
 
@@ -216 +222 @@
 WhileStmt::~WhileStmt() {
         delete body;
+        delete condition;
 }
 
@@ -290 +297 @@
 TryStmt::~TryStmt() {
         delete block;
+        deleteAll( handlers );
+        delete finallyBlock;
 }
 
@@ -309 +318 @@
 }
 
-CatchStmt::CatchStmt( std::list<Label> labels, Declaration *_decl, Statement *_body, bool isCatchRest ) :
-        Statement( labels ), decl ( _decl ), body( _body ), catchRest ( isCatchRest ) {
+CatchStmt::CatchStmt( std::list<Label> labels, Declaration *_decl, Statement *_body, bool catchAny ) :
+        Statement( labels ), decl ( _decl ), body( _body ), catchRest ( catchAny ) {
 }