Changeset 5e2c348

Timestamp:

Jan 31, 2018, 11:53:24 AM (6 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, 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:

2cb70aa

Parents:

5a73f0f

Message:

Assign a result type to StmtExpr? after resolution [fixes #79]

Location:

src

Files:

• ResolvExpr/Resolver.cc (modified) (1 diff)
• SynTree/Expression.cc (modified) (2 diffs)
• SynTree/Expression.h (modified) (1 diff)

src/ResolvExpr/Resolver.cc

@@ -716 +716 @@
                 PassVisitor<Resolver> resolver( indexer );
                 stmtExpr->accept( resolver );
+                stmtExpr->computeResult();
         }
 

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 {

src/SynTree/Expression.h

@@ -728 +728 @@
         StmtExpr * set_statements( CompoundStmt * newValue ) { statements = newValue; return this; }
 
+        // call to set the result type of this StmtExpr based on its body
+        void computeResult();
+
         std::list< ObjectDecl * > & get_returnDecls() { return returnDecls; }
         std::list< Expression * > & get_dtors() { return dtors; }