Changeset 0992849

Timestamp:

Feb 1, 2018, 4:33:00 PM (7 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:

624b722d

Parents:

295e5071

Message:

Assign a result type to StmtExpr? based on returnDecl in FixInit?

File:

• src/SynTree/Expression.cc (modified) (1 diff)

src/SynTree/Expression.cc

@@ -613 +613 @@
         delete result;
         result = nullptr;
-        if ( ! body.empty() ) {
+        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 );