signalmodule: Handle nullable ValueTypes properly and treat them as pointer

Nullable value-types are actually pointers to heap-allocated structures.
Therefore a pointer-based marshaller is required for those types.

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

1 files changed, 20 insertions, 2 deletions

diff --git a/codegen/valagsignalmodule.vala b/codegen/valagsignalmodule.vala
index 9eb567cd1..00c06c196 100644
--- a/codegen/valagsignalmodule.vala
+++ b/codegen/valagsignalmodule.vala
@@ -36,7 +36,11 @@ public class Vala.GSignalModule : GObjectModule {
 			}
 		}
 		
-		ret = "%s_%s_".printf (prefix, get_ccode_marshaller_type_name (return_type));
+		if (return_type is ValueType && return_type.nullable) {
+			ret = "%s_POINTER_".printf (prefix);
+		} else {
+			ret = "%s_%s_".printf (prefix, get_ccode_marshaller_type_name (return_type));
+		}
 		
 		if (params == null || params.size == 0) {
 			ret = ret + "_VOID";
@@ -58,6 +62,8 @@ public class Vala.GSignalModule : GObjectModule {
 			return "const char*";
 		} else if (t.data_type is Class || t.data_type is Interface) {
 			return "gpointer";
+		} else if (t is ValueType && t.nullable) {
+			return "gpointer";
 		} else if (t.data_type is Struct) {
 			var st = (Struct) t.data_type;
 			if (st.is_simple_type ()) {
@@ -87,7 +93,11 @@ public class Vala.GSignalModule : GObjectModule {
 	private string get_marshaller_signature (List<Parameter> params, DataType return_type) {
 		string signature;
 		
-		signature = "%s:".printf (get_ccode_marshaller_type_name (return_type));
+		if (return_type is ValueType && return_type.nullable) {
+			signature = "POINTER:";
+		} else {
+			signature = "%s:".printf (get_ccode_marshaller_type_name (return_type));
+		}
 		if (params == null || params.size == 0) {
 			signature = signature + "VOID";
 		} else {
@@ -283,6 +293,8 @@ public class Vala.GSignalModule : GObjectModule {
 				get_value_function = "g_value_get_pointer";
 			} else if (p.variable_type is ErrorType) {
 				get_value_function = "g_value_get_pointer";
+			} else if (p.variable_type is ValueType && p.variable_type.nullable) {
+				get_value_function = "g_value_get_pointer";
 			} else {
 				get_value_function = get_ccode_get_value_function (p.variable_type.data_type);
 			}
@@ -319,6 +331,8 @@ public class Vala.GSignalModule : GObjectModule {
 				set_fc = new CCodeFunctionCall (new CCodeIdentifier ("g_value_take_string"));
 			} else if (return_type.data_type is Class || return_type.data_type is Interface) {
 				set_fc = new CCodeFunctionCall (new CCodeIdentifier ("g_value_take_object"));
+			} else if (return_type is ValueType && return_type.nullable) {
+				set_fc = new CCodeFunctionCall (new CCodeIdentifier ("g_value_set_pointer"));
 			} else {
 				set_fc = new CCodeFunctionCall (new CCodeIdentifier (get_ccode_set_value_function (return_type.data_type)));
 			}
@@ -398,6 +412,8 @@ public class Vala.GSignalModule : GObjectModule {
 			csignew.add_argument (new CCodeConstant ("G_TYPE_POINTER"));
 		} else if (sig.return_type is ErrorType) {
 			csignew.add_argument (new CCodeConstant ("G_TYPE_POINTER"));
+		} else if (sig.return_type is ValueType && sig.return_type.nullable) {
+			csignew.add_argument (new CCodeConstant ("G_TYPE_POINTER"));
 		} else if (sig.return_type.data_type == null) {
 			csignew.add_argument (new CCodeConstant ("G_TYPE_NONE"));
 		} else {
@@ -427,6 +443,8 @@ public class Vala.GSignalModule : GObjectModule {
 				csignew.add_argument (new CCodeConstant ("G_TYPE_POINTER"));
 			} else if (param.variable_type is ErrorType) {
 				csignew.add_argument (new CCodeConstant ("G_TYPE_POINTER"));
+			} else if (param.variable_type is ValueType && param.variable_type.nullable) {
+				csignew.add_argument (new CCodeConstant ("G_TYPE_POINTER"));
 			} else {
 				csignew.add_argument (new CCodeConstant (get_ccode_type_id (param.variable_type.data_type)));
 			}