Changeset 85521c7 for src/SynTree

Timestamp:

Feb 1, 2018, 5:40:01 PM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

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, stuck-waitfor-destruct, with_gc

Children:

0188a0bc

Parents:

d0a045c7 (diff), 33c0ce8 (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

Location:

src/SynTree

Files:

• Declaration.h (modified) (1 diff)
• Expression.cc (modified) (2 diffs)
• Expression.h (modified) (1 diff)
• FunctionDecl.cc (modified) (2 diffs)

src/SynTree/Declaration.h

@@ -151 +151 @@
         FunctionType *type;
         CompoundStmt *statements;
+        std::list< Expression * > withExprs;
 
         FunctionDecl( const std::string &name, Type::StorageClasses scs, LinkageSpec::Spec linkage, FunctionType *type, CompoundStmt *statements,

src/SynTree/Expression.cc

@@ -597 +597 @@
 
 StmtExpr::StmtExpr( CompoundStmt *statements ) : statements( statements ) {
-        assert( statements );
-        std::list< Statement * > & body = statements->get_kids();
-        if ( ! body.empty() ) {
-                if ( ExprStmt * exprStmt = dynamic_cast< ExprStmt * >( body.back() ) ) {
-                        result = maybeClone( exprStmt->expr->result );
-                }
-        }
-        // ensure that StmtExpr has a result type
-        if ( ! result ) {
-                result = new VoidType( Type::Qualifiers() );
-        }
+        computeResult();
 }
 StmtExpr::StmtExpr( const StmtExpr &other ) : Expression( other ), statements( other.statements->clone() ) {
@@ -617 +607 @@
         deleteAll( dtors );
         deleteAll( returnDecls );
+}
+void StmtExpr::computeResult() {
+        assert( statements );
+        std::list< Statement * > & body = statements->kids;
+        delete result;
+        result = nullptr;
+        if ( ! returnDecls.empty() ) {
+                // prioritize return decl for result type, since if a return decl exists, then
+                // the StmtExpr is currently in an intermediate state where the body will always
+                // give a void result type.
+                result = returnDecls.front()->get_type()->clone();
+        } else if ( ! body.empty() ) {
+                if ( ExprStmt * exprStmt = dynamic_cast< ExprStmt * >( body.back() ) ) {
+                        result = maybeClone( exprStmt->expr->result );
+                }
+        }
+        // ensure that StmtExpr has a result type
+        if ( ! result ) {
+                result = new VoidType( Type::Qualifiers() );
+        }
 }
 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; }

src/SynTree/FunctionDecl.cc

@@ -51 +51 @@
                 VarExprReplacer::replace( this, declMap );
         }
+        cloneAll( other.withExprs, withExprs );
 }
 
@@ -56 +57 @@
         delete type;
         delete statements;
+        deleteAll( withExprs );
 }