Treat <bitfield>s the same as <enumeration>s

octachoron · octachoron · commit 757dce216a09 · 2014-08-15T19:04:54.000+02:00
They look almost exactly the same, the only difference seems to be
that while &lt;enumeration&gt;s allow for arbitrary integers as values
for their members, &lt;bitfield&gt;s only list single-bit flags. In BridJ,
enumeration members can be ORed together like flags, so the way we
map &lt;enumerations&gt; should work for &lt;bitfield&gt;s as well.
diff --git a/src/gir2java/GirParser.java b/src/gir2java/GirParser.java
@@ -69,7 +69,7 @@ public class GirParser {
 			elementParsers.put("field", GirParser.class.getDeclaredMethod("parseRecordField", Element.class, ParsingContext.class));
 			elementParsers.put("interface", GirParser.class.getDeclaredMethod("parseInterface", Element.class, ParsingContext.class));
 			elementParsers.put("union", GirParser.class.getDeclaredMethod("parseUnion", Element.class, ParsingContext.class));
-			elementParsers.put("bitfield", GirParser.class.getDeclaredMethod("parseBitfield", Element.class, ParsingContext.class));
+			elementParsers.put("bitfield", GirParser.class.getDeclaredMethod("parseEnumeration", Element.class, ParsingContext.class));
 			elementParsers.put("alias", GirParser.class.getDeclaredMethod("parseAlias", Element.class, ParsingContext.class));
 			elementParsers.put("callback", GirParser.class.getDeclaredMethod("parseCallback", Element.class, ParsingContext.class));
 			elementParsers.put("function", GirParser.class.getDeclaredMethod("parseMethodOrFunction", Element.class, ParsingContext.class));
@@ -911,24 +911,6 @@ private void parseUnion(Element root, ParsingContext context) {
 		context.registerType(convType);
 	}
 	
-	@SuppressWarnings("unused")
-	private void parseBitfield(Element root, ParsingContext context) {
-		// only log the fact that we have found this type for now
-		//Note: Should this be treated as a simple enum? BridJ IntValuedEnums support combining flags.
-		String name = root.getAttributeValue("name");
-		Set<String> foundTypes = (Set<String>)context.getExtra(Constants.CONTEXT_EXTRA_DEFINED_TYPES);
-		foundTypes.add("" + context.getExtra(Constants.CONTEXT_EXTRA_NAMESPACE) + '.' + name);
-		ConvertedType convType = new ConvertedType(
-				context.getCm(),
-				(String)context.getExtra(Constants.CONTEXT_EXTRA_NAMESPACE),
-				name,
-				root.getAttributeValue("type",Constants.GIR_XMLNS_C),
-				false
-		);
-		convType.setJType(context.getCm().ref(Object.class));
-		context.registerType(convType);
-	}
-	
 	@SuppressWarnings("unused")
 	private void parseAlias(Element root, ParsingContext context) {
 		// only log the fact that we have found this type for now
