From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Tue, 7 May 2019 13:44:37 +0000 (+0200)
Subject: girparser: Add support for string "ctype" metadata
X-Git-Tag: 0.36.20~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=37c7dd37b45d1738761949fe4e3933678784be88;p=thirdparty%2Fvala.git

girparser: Add support for string "ctype" metadata

https://gitlab.gnome.org/GNOME/vala/issues/793
---

diff --git a/vala/valagirparser.vala b/vala/valagirparser.vala
index e020d495e..6c38a2fe4 100644
--- a/vala/valagirparser.vala
+++ b/vala/valagirparser.vala
@@ -88,7 +88,8 @@ public class Vala.GirParser : CodeVisitor {
 		FINISH_VFUNC_NAME,
 		NO_ACCESSOR_METHOD,
 		DELEGATE_TARGET,
-		LOWER_CASE_CSUFFIX;
+		LOWER_CASE_CSUFFIX,
+		CTYPE;
 
 		public static ArgumentType? from_string (string name) {
 			var enum_class = (EnumClass) typeof(ArgumentType).class_ref ();
@@ -2606,7 +2607,11 @@ public class Vala.GirParser : CodeVisitor {
 			start_element ("type");
 		}
 
-		ctype = reader.get_attribute("c:type");
+		if (metadata.has_argument (ArgumentType.CTYPE)) {
+			ctype = metadata.get_string (ArgumentType.CTYPE);
+		} else {
+			ctype = reader.get_attribute("c:type");
+		}
 
 		next ();