[Gen] Fix up array parameters

Author: Therzok

src/Gir.Tests/ClassTests.cs

@@ -112,7 +112,7 @@ public AboutDialog () : base ()
 
 		static extern void gtk_about_dialog_add_credit_section (AboutDialog about, string section_name, string people);
 
-		public void AddCreditSection (string section_name, string people);
+		public void AddCreditSection (string section_name, string[] people);
 
 		static extern string gtk_about_dialog_get_artists (AboutDialog about);
 
@@ -176,11 +176,11 @@ public AboutDialog () : base ()
 
 		static extern void gtk_about_dialog_set_artists (AboutDialog about, string artists);
 
-		public void SetArtists (string artists);
+		public void SetArtists (string[] artists);
 
 		static extern void gtk_about_dialog_set_authors (AboutDialog about, string authors);
 
-		public void SetAuthors (string authors);
+		public void SetAuthors (string[] authors);
 
 		static extern void gtk_about_dialog_set_comments (AboutDialog about, string comments);
 
@@ -192,7 +192,7 @@ public AboutDialog () : base ()
 
 		static extern void gtk_about_dialog_set_documenters (AboutDialog about, string documenters);
 
-		public void SetDocumenters (string documenters);
+		public void SetDocumenters (string[] documenters);
 
 		static extern void gtk_about_dialog_set_license (AboutDialog about, string license);
 

src/Gir.Tests/ImportantGeneratables/GObject.cs

@@ -25,7 +25,7 @@ public Object (UIntPtr object_type, string first_property_name, ... var_args) :
 
 		static extern Object g_object_newv (UIntPtr object_type, uint n_parameters, Parameter parameters);
 
-		public Object (UIntPtr object_type, uint n_parameters, Parameter parameters) : base (object_type, n_parameters, parameters)
+		public Object (UIntPtr object_type, uint n_parameters, Parameter[] parameters) : base (object_type, n_parameters, parameters)
 		{
 		}
 
@@ -262,7 +262,7 @@ internal struct ObjectClass
 
 		static extern void g_object_class_install_properties (ObjectClass oclass, uint n_pspecs, ParamSpec pspecs);
 
-		public void InstallProperties (uint n_pspecs, ParamSpec pspecs);
+		public void InstallProperties (uint n_pspecs, ParamSpec[] pspecs);
 
 		static extern void g_object_class_install_property (ObjectClass oclass, uint property_id, ParamSpec pspec);
 

src/Gir.Tests/RecordTests.cs

@@ -83,7 +83,7 @@ public struct ByteArray
 		/// and will be freed with g_free(), i.e. it could be allocated using g_strdup().
 		///</summary>
 		///<returns>a new #GByteArray</returns>
-		public static ByteArray NewTake (byte data, UIntPtr len);
+		public static ByteArray NewTake (byte[] data, UIntPtr len);
 
 		static extern ByteArray g_byte_array_prepend (ByteArray array, byte data, uint len);
 

src/Gir/Generation/Callback.cs

@@ -11,25 +11,25 @@ public void Generate (GenerationOptions opts)
 				// Otherwise, we need to generate code which uses a non-static callback.
 
 				var returnType = this.GetReturnCSharpType (writer);
-				var (typesAndNames, names) = this.BuildParameters (opts, true);
+				var parameters = this.BuildParameters (opts, true);
 
 				// Public API delegate which uses managed types.
 				writer.WriteLine ("[UnmanagedFunctionPointer (CallingConvention.Cdecl)]");
-				writer.WriteLine ($"public delegate {returnType} {Name} ({typesAndNames})");
+				writer.WriteLine ($"public delegate {returnType} {Name} ({parameters.TypesAndNames})");
 				writer.WriteLine ();
 
 				// Internal API delegate which uses unmanaged types.
 				writer.WriteLine ("[UnmanagedFunctionPointer (CallingConvention.Cdecl)]");
 				// TODO: Use native marshal types.
-				writer.WriteLine ($"internal delegate {returnType} {Name}Native ({typesAndNames})");
+				writer.WriteLine ($"internal delegate {returnType} {Name}Native ({parameters.TypesAndNames})");
 				writer.WriteLine ();
 
 				// Generate wrapper class - static if we can use gchandle, otherwise instance
 				// Check callback convention - async, notify, call
 				writer.WriteLine ($"internal static class {Name}Wrapper");
 				writer.WriteLine ("{");
 				using (writer.Indent ()) {
-					writer.WriteLine ($"public static void NativeCallback ({typesAndNames})");
+					writer.WriteLine ($"public static void NativeCallback ({parameters.TypesAndNames})");
 					writer.WriteLine ("{");
 					// TODO: marshal params, call, handle exceptions
 					writer.WriteLine ("}");

src/Gir/Generation/IGeneratableExtensions.cs

@@ -49,7 +49,7 @@ static void GenerateImport (this INativeCallable callable, IGeneratable parent,
 		{
 			var retType = GetReturnCSharpType (callable, writer);
 
-			var (typesAndNames, names) = BuildParameters (callable, writer.Options, appendInstanceParameters: true);
+			var parameters = BuildParameters (callable, writer.Options, appendInstanceParameters: true);
 
 			// TODO: Better than using the constant string, insert a custom generatable which contains the import string as a constant.
 			/* i.e.
@@ -59,7 +59,7 @@ static class <LibraryName>Constants
 }
 			 */
 			//writer.WriteLine ($"[DllImport (\"{writer.Options.LibraryName}\", CallingConvention=CallingConvention.Cdecl)]");
-			writer.WriteLine ($"static extern {retType} {callable.CIdentifier} ({typesAndNames});");
+			writer.WriteLine ($"static extern {retType} {callable.CIdentifier} ({parameters.MarshalTypesAndNames});");
 			writer.WriteLine ();
 		}
 
@@ -87,8 +87,8 @@ public static void GenerateCallableDefinition (this INativeCallable callable, IG
 			var returnType = callable.GetReturnCSharpType (writer);
 
 			// generate ReturnValue then Parameters
-			var (typesAndNames, names) = BuildParameters (callable, writer.Options, !callable.IsInstanceCallable (gen, writer.Options));
-			writer.Write (string.Format ("{0} {1} ({2});", returnType, callable.Name.ToCSharp (), typesAndNames));
+			var result = BuildParameters (callable, writer.Options, !callable.IsInstanceCallable (gen, writer.Options));
+			writer.Write (string.Format ("{0} {1} ({2});", returnType, callable.Name.ToCSharp (), result.TypesAndNames));
 			writer.WriteLine ();
 		}
 
@@ -98,17 +98,18 @@ public static void GenerateConstructor (this INativeCallable callable, IGenerata
 
 			var modifier = callable.GetModifiers (parent, writer.Options);
 
-			var (typesAndNames, names) = BuildParameters (callable, writer.Options, !callable.IsInstanceCallable (parent, writer.Options));
+			var result = BuildParameters (callable, writer.Options, !callable.IsInstanceCallable (parent, writer.Options));
 
 			// FIXME, should check to see if it is deprecated
-			writer.WriteLine ($"{modifier} {parent.Name} ({typesAndNames}) : base ({names})");
+			writer.WriteLine ($"{modifier} {parent.Name} ({result.TypesAndNames}) : base ({result.Names})");
 			writer.WriteLine ("{");
 			writer.WriteLine ("}");
 		}
 
-		public static (string both, string names) BuildParameters (this IMethodLike callable, GenerationOptions opts, bool appendInstanceParameters)
+		public static BuildParametersResult BuildParameters(this IMethodLike callable, GenerationOptions opts, bool appendInstanceParameters)
 		{
 			var parameters = callable.Parameters;
+			var marshalTypeAndName = new List<string>(parameters.Count);
 			var typeAndName = new List<string> (parameters.Count);
 			var parameterNames = new List<string> (parameters.Count);
 
@@ -124,20 +125,36 @@ public static (string both, string names) BuildParameters (this IMethodLike call
 				}
 
 				var symbol = parameter.Resolve(opts);
-				typeAndName.Add(symbol.CSharpType + " " + parameter.Name);
+				marshalTypeAndName.Add(symbol.CSharpType + " " + parameter.Name);
+				typeAndName.Add(symbol.CSharpType + (parameter.Array != null ? "[]" : "") + " " + parameter.Name);
 				parameterNames.Add(parameter.Name);
 			}
 
 			// PERF: Use an array as the string[] overload of Join is way more efficient than the IEnumerable<string> one.
+			string marshalParameterString = string.Join(", ", marshalTypeAndName.ToArray());
 			string parameterString = string.Join (", ", typeAndName.ToArray ());
 			string baseParams = string.Join (", ", parameterNames.ToArray ());
 
-			return (parameterString, baseParams);
+			return new BuildParametersResult(marshalParameterString, parameterString, baseParams);
 		}
 
 		static IEnumerable<IMemberGeneratable> GetMemberGeneratables (this IGeneratable gen)
 		{
 			return Utils.GetAllCollectionMembers<IMemberGeneratable> (gen);
 		}
 	}
+
+	public class BuildParametersResult
+	{
+		public string MarshalTypesAndNames { get; }
+		public string TypesAndNames { get; }
+		public string Names { get; }
+
+		public BuildParametersResult(string marshalTypesAndNames, string typesAndNames, string names)
+		{
+			MarshalTypesAndNames = marshalTypesAndNames;
+			TypesAndNames = typesAndNames;
+			Names = names;
+		}
+	}
 }