Prefix enum constant names with class name

octachoron · octachoron · commit fef4ce2f98ff · 2014-08-13T11:07:38.000+02:00
Some enum constant names defined in .gir files are not legal Java,
for example, they can begin with a number. The c:identifier is not
always usable either, as in some cases it contains a free-form
description. Transforming the enum class name from CamelCase to
ALL_UPPERCASE_WITH_UNDERSCORES_, and prefixing it to the enum
constant names should produce legal Java enum constant names.
diff --git a/src/gir2java/GirParser.java b/src/gir2java/GirParser.java
@@ -441,7 +441,9 @@ private void parseEnumeration(Element root, ParsingContext context) {
 	private void parseEnumMember(Element root, ParsingContext context) {
 		JDefinedClass enumClass = (JDefinedClass) context.getCmNode();
 		
-		JEnumConstant enumConstant = enumClass.enumConstant(root.getAttributeValue("name").toUpperCase());
+		JEnumConstant enumConstant = enumClass.enumConstant(
+				NameUtils.camelToUpper(enumClass.name()) + '_' + root.getAttributeValue("name").toUpperCase()
+		);
 		long value = Long.parseLong(root.getAttributeValue("value"));
 		enumConstant.arg(JExpr.lit(value));
 		System.out.println("--> " + enumConstant.getName() + " (" + value + ")");
diff --git a/src/gir2java/NameUtils.java b/src/gir2java/NameUtils.java
@@ -86,4 +86,13 @@ public static String neutralizeKeyword(String input) {
 			return input;
 		}
 	}
+	
+	/**
+	 * Convert CamelCase strings to ALL_UPPERCASE_WITH_UNDERSCORES.
+	 * @param camel
+	 * @return
+	 */
+	public static String camelToUpper(String camel) {
+		return camel.replaceAll("([A-Z][a-z0-9])", "_$1").substring(1).toUpperCase();
+	}
 }

Original file line number	Diff line number	Diff line change
`@@ -86,4 +86,13 @@ public static String neutralizeKeyword(String input) {`
`86`	`86`	`return input;`
`87`	`87`	`}`
`88`	`88`	`}`
	`89`	`+`
	`90`	`+ /**`
	`91`	`+ * Convert CamelCase strings to ALL_UPPERCASE_WITH_UNDERSCORES.`
	`92`	`+ * @param camel`
	`93`	`+ * @return`
	`94`	`+ */`
	`95`	`+ public static String camelToUpper(String camel) {`
	`96`	`+ return camel.replaceAll("([A-Z][a-z0-9])", "_$1").substring(1).toUpperCase();`
	`97`	`+ }`
`89`	`98`	`}`