codegen: Move construct property checks to SemanticAnalyzer pass

diff --git a/codegen/valaccodebasemodule.vala b/codegen/valaccodebasemodule.vala
index f0d03ba781f655c6c96cdf67b6c115627c39d1d4..9a134f33f8264e24596020e6c61d49f9bec69764 100644 (file)
--- a/codegen/valaccodebasemodule.vala
+++ b/codegen/valaccodebasemodule.vala
@@ -1640,16 +1640,6 @@ public abstract class Vala.CCodeBaseModule : CodeGenerator {
 
                var t = (TypeSymbol) prop.parent_symbol;
 
-               if (acc.construction && !t.is_subtype_of (gobject_type)) {
-                       Report.error (acc.source_reference, "construct properties require GLib.Object");
-                       acc.error = true;
-                       return;
-               } else if (acc.construction && !context.analyzer.is_gobject_property (prop)) {
-                       Report.error (acc.source_reference, "construct properties not supported for specified property type");
-                       acc.error = true;
-                       return;
-               }
-
                // do not declare overriding properties and interface implementations
                if (prop.is_abstract || prop.is_virtual
                    || (prop.base_property == null && prop.base_interface_property == null)) {

diff --git a/vala/valapropertyaccessor.vala b/vala/valapropertyaccessor.vala
index e348c2510f555354af31d4b56580dec96b43d627..f9fc981713e3244d8499ce05aa73c4746c43c27f 100644 (file)
--- a/vala/valapropertyaccessor.vala
+++ b/vala/valapropertyaccessor.vala
@@ -184,6 +184,16 @@ public class Vala.PropertyAccessor : Subroutine {
                        return false;
                }
 
+               if (construction && !((TypeSymbol) prop.parent_symbol).is_subtype_of (context.analyzer.object_type)) {
+                       error = true;
+                       Report.error (source_reference, "construct properties require `GLib.Object'");
+                       return false;
+               } else if (construction && !context.analyzer.is_gobject_property (prop)) {
+                       error = true;
+                       Report.error (source_reference, "construct properties not supported for specified property type");
+                       return false;
+               }
+
                if (body != null && prop.is_abstract) {
                        error = true;
                        Report.error (source_reference, "Accessor of abstract property `%s' cannot have body".printf (prop.get_full_name ()));