[vala/staging] girparser: Better support of "cprefix" argument in metadata



commit b5ed9220cfa0927c22aa3ed0b8a038d23495fdd8
Author: Rico Tzschichholz <ricotz ubuntu com>
Date:   Sat Aug 26 12:48:38 2017 +0200

    girparser: Better support of "cprefix" argument in metadata

 vala/valagirparser.vala |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/vala/valagirparser.vala b/vala/valagirparser.vala
index ff2e3d3..f030c08 100644
--- a/vala/valagirparser.vala
+++ b/vala/valagirparser.vala
@@ -715,7 +715,12 @@ public class Vala.GirParser : CodeVisitor {
                        if (name == null) {
                                return "";
                        }
-                       var prefix = symbol.get_attribute_string ("CCode", "cprefix");
+                       string prefix;
+                       if (metadata.has_argument (ArgumentType.CPREFIX)) {
+                               prefix = metadata.get_string (ArgumentType.CPREFIX);
+                       } else {
+                               prefix = symbol.get_attribute_string ("CCode", "cprefix");
+                       }
                        if (prefix == null && girdata != null && girdata["c:identifier-prefixes"] != null) {
                                prefix = girdata["c:identifier-prefixes"];
                                int idx = prefix.index_of (",");


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]