From: Didier 'Ptitjes <ptitjes@free.fr>
Date: Fri, 20 Mar 2009 19:40:17 +0000 (+0100)
Subject: GIR writer: Generate enum values and c:identifer attributes
X-Git-Tag: 0.7.2~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b936d9f35fabd83b263ab7c586c3852b7aa25fb;p=thirdparty%2Fvala.git

GIR writer: Generate enum values and c:identifer attributes

Signed-off-by: Didier 'Ptitjes <ptitjes@free.fr>
---

diff --git a/gobject/valagirwriter.vala b/gobject/valagirwriter.vala
index c6bad7a19..c32b87a81 100644
--- a/gobject/valagirwriter.vala
+++ b/gobject/valagirwriter.vala
@@ -303,6 +303,7 @@ public class Vala.GIRWriter : CodeVisitor {
 		stream.printf (">\n");
 		indent++;
 
+		enum_value = 0;
 		en.accept_children (this);
 
 		indent--;
@@ -310,9 +311,18 @@ public class Vala.GIRWriter : CodeVisitor {
 		stream.printf ("</enumeration>\n");
 	}
 
+	private int enum_value;
+
 	public override void visit_enum_value (EnumValue ev) {
 		write_indent ();
-		stream.printf ("<member name=\"%s\"/>\n", string.joinv ("-", ev.name.down ().split ("_")));
+		stream.printf ("<member name=\"%s\" c:identifier=\"%s\"", ev.name.down (), ev.get_cname ());
+		if (ev.value != null) {
+			string value = literal_expression_to_value_string (ev.value);
+			stream.printf (" value=\"%s\"", value);
+		} else {
+			stream.printf (" value=\"%d\"", enum_value++);
+		}
+		stream.printf ("/>\n");
 	}
 
 	public override void visit_error_domain (ErrorDomain edomain) {