Changes in src/SynTree/Expression.cc [0690350:5e2c348]

File:

• src/SynTree/Expression.cc (modified) (2 diffs)

src/SynTree/Expression.cc

@@ -597 +597 @@
 
 StmtExpr::StmtExpr( CompoundStmt *statements ) : statements( statements ) {
+        computeResult();
+}
+StmtExpr::StmtExpr( const StmtExpr &other ) : Expression( other ), statements( other.statements->clone() ) {
+        cloneAll( other.returnDecls, returnDecls );
+        cloneAll( other.dtors, dtors );
+}
+StmtExpr::~StmtExpr() {
+        delete statements;
+        deleteAll( dtors );
+        deleteAll( returnDecls );
+}
+void StmtExpr::computeResult() {
         assert( statements );
-        std::list< Statement * > & body = statements->get_kids();
+        std::list< Statement * > & body = statements->kids;
+        delete result;
+        result = nullptr;
         if ( ! body.empty() ) {
                 if ( ExprStmt * exprStmt = dynamic_cast< ExprStmt * >( body.back() ) ) {
@@ -608 +622 @@
                 result = new VoidType( Type::Qualifiers() );
         }
-}
-StmtExpr::StmtExpr( const StmtExpr &other ) : Expression( other ), statements( other.statements->clone() ) {
-        cloneAll( other.returnDecls, returnDecls );
-        cloneAll( other.dtors, dtors );
-}
-StmtExpr::~StmtExpr() {
-        delete statements;
-        deleteAll( dtors );
-        deleteAll( returnDecls );
 }
 void StmtExpr::print( std::ostream &os, Indenter indent ) const {