Report error when initializing constants or fields in bindings

Fixes bug 556197.

diff --git a/vala/valaconstant.vala b/vala/valaconstant.vala
index 1aa299a54bd479532f2e26032cb8927b6b1796f8..54722c37ab80e7e053d35c21eb03f9b59d58176a 100644 (file)
--- a/vala/valaconstant.vala
+++ b/vala/valaconstant.vala
@@ -191,6 +191,11 @@ public class Vala.Constant : Member, Lockable {
                                        return false;
                                }
                        }
+               } else {
+                       if (initializer != null) {
+                               error = true;
+                               Report.error (source_reference, "External constants cannot use initializers");
+                       }
                }
 
                if (!external_package && !hides && get_hidden_member () != null) {

diff --git a/vala/valafield.vala b/vala/valafield.vala
index 420f7f9eed5ac8c01e7286917c3964a955460c46..43336a89f490ff7e0b7badd6e654342f0ff35285 100644 (file)
--- a/vala/valafield.vala
+++ b/vala/valafield.vala
@@ -319,6 +319,11 @@ public class Vala.Field : Member, Lockable {
                                Report.error (source_reference, "Cannot convert from `%s' to `%s'".printf (initializer.value_type.to_string (), field_type.to_string ()));
                                return false;
                        }
+
+                       if (external) {
+                               error = true;
+                               Report.error (source_reference, "External fields cannot use initializers");
+                       }
                }
 
                if (binding == MemberBinding.INSTANCE && parent_symbol is Interface) {