vala: Report an error when initializing non-auto properties

https://bugzilla.gnome.org/show_bug.cgi?id=795225

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5ec1473c5af0368120c2f62499486c66394fc4cf..64ce795f35a73d073c8b82930a103022fc40ceda 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -310,6 +310,9 @@ TESTS = \
        objects/bug783897.vala \
        objects/bug788964.vala \
        objects/bug795225-1.test \
+       objects/bug795225-2.test \
+       objects/bug795225-3.test \
+       objects/bug795225-4.test \
        errors/catch-error-code.vala \
        errors/errors.vala \
        errors/bug567181.vala \

diff --git a/tests/objects/bug795225-2.test b/tests/objects/bug795225-2.test
new file mode 100644 (file)
index 0000000..fc04d5a
--- /dev/null
+++ b/tests/objects/bug795225-2.test
@@ -0,0 +1,14 @@
+Invalid Code
+
+class Foo : Object {
+       int _fub = 0;
+
+       public int bar {
+               get { return _fub; }
+               set { _fub = value / 2; }
+               default = 42;
+       }
+}
+
+void main () {
+}

diff --git a/tests/objects/bug795225-3.test b/tests/objects/bug795225-3.test
new file mode 100644 (file)
index 0000000..1459a23
--- /dev/null
+++ b/tests/objects/bug795225-3.test
@@ -0,0 +1,13 @@
+Invalid Code
+
+class Foo : Object {
+       int _fub = 0;
+
+       public int bar {
+               get { return _fub; }
+               default = 42;
+       }
+}
+
+void main () {
+}

diff --git a/tests/objects/bug795225-4.test b/tests/objects/bug795225-4.test
new file mode 100644 (file)
index 0000000..1456299
--- /dev/null
+++ b/tests/objects/bug795225-4.test
@@ -0,0 +1,13 @@
+Invalid Code
+
+class Foo : Object {
+       int _fub = 0;
+
+       public int bar {
+               set { _fub = value / 2; }
+               default = 42;
+       }
+}
+
+void main () {
+}

diff --git a/vala/valaproperty.vala b/vala/valaproperty.vala
index ff953777cbebcf3536f30f278cfabd9b30b2fa4a..81bb84950788ce02e36cd1365c61afd3060cce59 100644 (file)
--- a/vala/valaproperty.vala
+++ b/vala/valaproperty.vala
@@ -480,6 +480,12 @@ public class Vala.Property : Symbol, Lockable {
                        set_accessor.check (context);
                }
 
+               if (initializer != null && field == null && !is_abstract) {
+                       error = true;
+                       Report.error (source_reference, "Property `%s' with custom `get' accessor and/or `set' mutator cannot have `default' value".printf (get_full_name ()));
+                       return false;
+               }
+
                if (initializer != null) {
                        initializer.check (context);
                }