From 37c7dd37b45d1738761949fe4e3933678784be88 Mon Sep 17 00:00:00 2001 From: Rico Tzschichholz Date: Tue, 7 May 2019 15:44:37 +0200 Subject: [PATCH] girparser: Add support for string "ctype" metadata https://gitlab.gnome.org/GNOME/vala/issues/793 --- vala/valagirparser.vala | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) 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 (); -- 2.47.2