vala: Add result variable while checking post-conditions

diff --git a/vala/valamethod.vala b/vala/valamethod.vala
index 7bcdfdfdfbc4c369293703fc7e16fef61a04a727..9b6739236575dd746bc73fa6c3515586f48798f1 100644 (file)
--- a/vala/valamethod.vala
+++ b/vala/valamethod.vala
@@ -291,9 +291,15 @@ public class Vala.Method : Subroutine, Callable {
                }
 
                if (postconditions != null) {
+                       if (postconditions.size > 0 && result_var != null) {
+                               scope.add ("result", result_var);
+                       }
                        foreach (Expression postcondition in postconditions) {
                                postcondition.accept (visitor);
                        }
+                       if (postconditions.size > 0 && result_var != null) {
+                               scope.remove ("result");
+                       }
                }
 
                if (body != null) {
@@ -850,9 +856,15 @@ public class Vala.Method : Subroutine, Callable {
                }
 
                if (postconditions != null) {
+                       if (postconditions.size > 0 && result_var != null) {
+                               scope.add ("result", result_var);
+                       }
                        foreach (Expression postcondition in postconditions) {
                                postcondition.check (context);
                        }
+                       if (postconditions.size > 0 && result_var != null) {
+                               scope.remove ("result");
+                       }
                }
 
                if (body != null) {