Changes in / [c1c09285:8f62de7]

Location:

src

Files:

• SymTab/Validate.cc (modified) (1 diff)
• SynTree/Statement.cc (modified) (1 diff)

src/SymTab/Validate.cc

@@ -483 +483 @@
 
         void ReturnChecker::visit( ReturnStmt * returnStmt ) {
-                // Previously this also checked for the existence of an expr paired with no return values on
-                // the  function return type. This is incorrect, since you can have an expression attached to
-                // a return statement in a void-returning function in C. The expression is treated as if it
-                // were cast to void.
                 if ( returnStmt->get_expr() == NULL && returnVals.size() != 0 ) {
                         throw SemanticError( "Non-void function returns no values: " , returnStmt );
+                } else if ( returnStmt->get_expr() != NULL && returnVals.size() == 0 ) {
+                        throw SemanticError( "void function returns values: " , returnStmt );
                 }
         }

src/SynTree/Statement.cc

@@ -399 +399 @@
 }
 
-ImplicitCtorDtorStmt::ImplicitCtorDtorStmt( const ImplicitCtorDtorStmt & other ) : Statement( other ), callStmt( maybeClone( other.callStmt ) ) {
+ImplicitCtorDtorStmt::ImplicitCtorDtorStmt( const ImplicitCtorDtorStmt & other ) : Statement( other ), callStmt( other.callStmt ) {
 }
 
 ImplicitCtorDtorStmt::~ImplicitCtorDtorStmt() {
-        delete callStmt;
 }