Changes in src/Parser/StatementNode.cc [7ecbb7e:ac71a86]

File:

• src/Parser/StatementNode.cc (modified) (4 diffs)

src/Parser/StatementNode.cc

@@ -44 +44 @@
                         agg = decl;
                 } // if
-                stmt = new DeclStmt( noLabels, maybeBuild< Declaration >(agg) );
+                stmt.reset( new DeclStmt( noLabels, maybeBuild< Declaration >(agg) ) );
         } else {
                 assert( false );
@@ -56 +56 @@
                 StatementNode *node = dynamic_cast< StatementNode * >(curr);
                 assert( node );
-                assert( dynamic_cast< CaseStmt * >(node->stmt) );
+                assert( dynamic_cast< CaseStmt * >(node->stmt.get()) );
                 prev = curr;
         } // for
@@ -64 +64 @@
         buildMoveList( stmt, stmts );
         // splice any new Statements to end of current Statements
-        CaseStmt * caseStmt = dynamic_cast< CaseStmt * >(node->stmt);
+        CaseStmt * caseStmt = dynamic_cast< CaseStmt * >(node->stmt.get());
         caseStmt->get_statements().splice( caseStmt->get_statements().end(), stmts );
         return this;
@@ -153 +153 @@
         std::list< Expression * > exps;
         buildMoveList( ctl, exps );
-        return new ReturnStmt( noLabels, exps.size() > 0 ? exps.back() : nullptr, true );
+        assertf( exps.size() < 2, "This means we are leaking memory");
+        return new ReturnStmt( noLabels, !exps.empty() ? exps.back() : nullptr, true );
 }