Changeset 446dde5 for src/AST/Expr.cpp

Timestamp:

Mar 25, 2025, 7:53:02 PM (3 weeks ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

master

Children:

379b6ea

Parents:

d73e667

Message:

Removed two unused fields from StmtExpr?, returnDecls and dtors, and refactored computeResult to set resultExpr when it can be found at that time.

File:

• src/AST/Expr.cpp (modified) (1 diff)

src/AST/Expr.cpp ¶

@@ -393 +393 @@
 
 StmtExpr::StmtExpr( const CodeLocation & loc, const CompoundStmt * ss )
-: Expr( loc ), stmts( ss ), returnDecls(), dtors() { computeResult(); }
+: Expr( loc ), stmts( ss ) { computeResult(); }
 
 void StmtExpr::computeResult() {
         assert( stmts );
         const std::list<ptr<Stmt>> & body = stmts->kids;
-        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();
-        } else if ( ! body.empty() ) {
-                if ( const ExprStmt * exprStmt = body.back().as< ExprStmt >() ) {
-                        result = exprStmt->expr->result;
-                }
-        }
-        // ensure a result type exists
-        if ( ! result ) { result = new VoidType{}; }
+        // If there is a tail expression, its result is entire result.
+        if ( !body.empty() && ( resultExpr = body.back().as<ExprStmt>() ) ) {
+                result = resultExpr->expr->result;
+        // Otherwise, fill in the result with void so there is a result type.
+        } else {
+                result = new VoidType();
+        }
 }