[vala/staging] girparser: Support "cname" argument in metadata
- From: Rico Tzschichholz <ricotz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vala/staging] girparser: Support "cname" argument in metadata
- Date: Sat, 26 Aug 2017 11:58:01 +0000 (UTC)
commit 3bcfd0be082b7f6317b7eeebc899a1885840036d
Author: Rico Tzschichholz <ricotz ubuntu com>
Date: Sat Aug 26 12:43:53 2017 +0200
girparser: Support "cname" argument in metadata
vala/valagirparser.vala | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/vala/valagirparser.vala b/vala/valagirparser.vala
index 219728c..ff2e3d3 100644
--- a/vala/valagirparser.vala
+++ b/vala/valagirparser.vala
@@ -85,7 +85,8 @@ public class Vala.GirParser : CodeVisitor {
RETURN_VOID,
RETURNS_MODIFIED_POINTER,
DELEGATE_TARGET_CNAME,
- FINISH_VFUNC_NAME;
+ FINISH_VFUNC_NAME,
+ CNAME;
public static ArgumentType? from_string (string name) {
var enum_class = (EnumClass) typeof(ArgumentType).class_ref ();
@@ -736,7 +737,12 @@ public class Vala.GirParser : CodeVisitor {
if (name == null) {
return "";
}
- var cname = symbol.get_attribute_string ("CCode", "cname");
+ string cname;
+ if (metadata.has_argument (ArgumentType.CNAME)) {
+ cname = metadata.get_string (ArgumentType.CNAME);
+ } else {
+ cname = symbol.get_attribute_string ("CCode", "cname");
+ }
if (girdata != null) {
if (cname == null) {
cname = girdata["c:identifier"];
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]