Accept pre- and postconditions for constructors

Fixes bug 607110.

diff --git a/vala/valacreationmethod.vala b/vala/valacreationmethod.vala
index 8469e1778240e5340861c250d1eba0a86a75a02d..8bcaecfa1539b04091f1dbeef1d2a46082a5778f 100644 (file)
--- a/vala/valacreationmethod.vala
+++ b/vala/valacreationmethod.vala
@@ -80,6 +80,14 @@ public class Vala.CreationMethod : Method {
                        error_type.accept (visitor);
                }
 
+               foreach (Expression precondition in get_preconditions ()) {
+                       precondition.accept (visitor);
+               }
+
+               foreach (Expression postcondition in get_postconditions ()) {
+                       postcondition.accept (visitor);
+               }
+
                if (body != null) {
                        body.accept (visitor);
                }
@@ -153,6 +161,14 @@ public class Vala.CreationMethod : Method {
                        error_type.check (analyzer);
                }
 
+               foreach (Expression precondition in get_preconditions ()) {
+                       precondition.check (analyzer);
+               }
+
+               foreach (Expression postcondition in get_postconditions ()) {
+                       postcondition.check (analyzer);
+               }
+
                if (body != null) {
                        body.check (analyzer);
 

diff --git a/vala/valaparser.vala b/vala/valaparser.vala
index 5a29d139ff642dd657d380b263e32b553745299e..4b3c7fde7fa4d9b76e919c90bb7e34f9d5580606 100644 (file)
--- a/vala/valaparser.vala
+++ b/vala/valaparser.vala
@@ -2991,6 +2991,16 @@ public class Vala.Parser : CodeVisitor {
                                method.add_error_type (parse_type ());
                        } while (accept (TokenType.COMMA));
                }
+               while (accept (TokenType.REQUIRES)) {
+                       expect (TokenType.OPEN_PARENS);
+                       method.add_precondition (parse_expression ());
+                       expect (TokenType.CLOSE_PARENS);
+               }
+               while (accept (TokenType.ENSURES)) {
+                       expect (TokenType.OPEN_PARENS);
+                       method.add_postcondition (parse_expression ());
+                       expect (TokenType.CLOSE_PARENS);
+               }
                method.access = access;
                set_attributes (method, attrs);
                if (!accept (TokenType.SEMICOLON)) {