From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Thu, 19 Apr 2018 12:51:12 +0000 (+0200)
Subject: codegen: *Drop* support for non-auto property initializer in gobjects
X-Git-Tag: 0.41.90~173
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9adb86392347edb984842df444888f1916daa26a;p=thirdparty%2Fvala.git

codegen: *Drop* support for non-auto property initializer in gobjects

Partly reverts 73e553ac3488d641fb08b275bcf2636e3cf0de67
https://bugzilla.gnome.org/show_bug.cgi?id=701978

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

diff --git a/codegen/valagobjectmodule.vala b/codegen/valagobjectmodule.vala
index 82eba0774..11aa6e686 100644
--- a/codegen/valagobjectmodule.vala
+++ b/codegen/valagobjectmodule.vala
@@ -688,27 +688,6 @@ public class Vala.GObjectModule : GTypeModule {
 
 		if (is_gobject_property (prop) && prop.parent_symbol is Class) {
 			prop_enum.add_value (new CCodeEnumValue ("%s_PROPERTY".printf (get_ccode_upper_case_name (prop))));
-
-			if (prop.initializer != null && prop.set_accessor != null && !prop.set_accessor.automatic_body) {
-				// generate a custom initializer if it couldn't be done at class_init time
-				bool has_spec_initializer = prop.property_type.data_type is Enum;
-				if (!has_spec_initializer && prop.property_type.data_type is Struct) {
-					var param_spec_func = get_ccode_param_spec_function (prop.property_type.data_type);
-					has_spec_initializer = param_spec_func != "g_param_spec_boxed";
-				}
-				if (!has_spec_initializer) {
-					push_context (instance_init_context);
-
-					prop.initializer.emit (this);
-
-					var inst_ma = new MemberAccess.simple ("this");
-					inst_ma.target_value = new GLibValue (get_data_type_for_symbol ((Class) prop.parent_symbol), new CCodeIdentifier ("self"), true);
-					store_property (prop, inst_ma, prop.initializer.target_value);
-
-					temp_ref_values.clear ();
-					pop_context ();
-				}
-			}
 		}
 	}
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index de61c5821..5ec1473c5 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -286,7 +286,6 @@ TESTS = \
 	objects/bug681356.vala \
 	objects/bug683646.vala \
 	objects/bug695671.vala \
-	objects/bug701978.vala \
 	objects/bug702736.vala \
 	objects/bug702846.vala \
 	objects/bug731547.vala \
diff --git a/tests/objects/bug701978.vala b/tests/objects/bug701978.vala
deleted file mode 100644
index 22fcfafdd..000000000
--- a/tests/objects/bug701978.vala
+++ /dev/null
@@ -1,22 +0,0 @@
-public struct Foo {
-	public int val { get; set; }
-
-	public Foo () {
-		val = 55;
-	}
-}
-
-public class Bar : Object {
-	private Foo _foo;
-
-	public Foo foo {
-		get { return _foo; }
-		set { _foo = value; }
-		default = Foo ();
-	}
-}
-
-void main () {
-	var bar = new Bar();
-	assert (bar.foo.val == 55);
-}