[vala] girparser: handle multiple identifier-prefixes in namespaces
- From: Evan Nemerson <evann src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vala] girparser: handle multiple identifier-prefixes in namespaces
- Date: Sat, 31 May 2014 03:55:02 +0000 (UTC)
commit e3308560221c2c526951ee53b007d5f621a645d5
Author: Evan Nemerson <evan nemerson com>
Date: Fri May 30 20:45:54 2014 -0700
girparser: handle multiple identifier-prefixes in namespaces
vala/valagirparser.vala | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
---
diff --git a/vala/valagirparser.vala b/vala/valagirparser.vala
index 05a0703..5ac350e 100644
--- a/vala/valagirparser.vala
+++ b/vala/valagirparser.vala
@@ -678,8 +678,12 @@ public class Vala.GirParser : CodeVisitor {
return "";
}
var prefix = symbol.get_attribute_string ("CCode", "cprefix");
- if (prefix == null && girdata != null) {
+ if (prefix == null && girdata != null && girdata["c:identifier-prefixes"] != null) {
prefix = girdata["c:identifier-prefixes"];
+ int idx = prefix.index_of (",");
+ if (idx != -1) {
+ prefix = prefix.substring (0, idx);
+ }
}
if (prefix == null) {
if (symbol is Enum || symbol is ErrorDomain) {
@@ -1910,6 +1914,13 @@ public class Vala.GirParser : CodeVisitor {
start_element ("namespace");
string? cprefix = reader.get_attribute ("c:identifier-prefixes");
+ if (cprefix != null) {
+ int idx = cprefix.index_of (",");
+ if (idx != -1) {
+ cprefix = cprefix.substring (0, idx);
+ }
+ }
+
string? lower_case_cprefix = reader.get_attribute ("c:symbol-prefixes");
string vala_namespace = cprefix;
string gir_namespace = reader.get_attribute ("name");
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]