Fix mapping of pointer and array types

octachoron · octachoron · commit 0e52a03cfdc9 · 2014-08-14T20:09:01.000+02:00
diff --git a/src/gir2java/ConvertedType.java b/src/gir2java/ConvertedType.java
@@ -108,8 +108,20 @@ public ConvertedType forCType(ParsingContext context, String ctype) {
 		
 		ConvertedType pointerConvType = new ConvertedType(this);
 		
+		JType currentJType = getJType();
+		int currentIndirection = 0;
+		
+		while ( (currentJType != null) && currentJType.name().startsWith("Pointer<")) {
+			currentIndirection++;
+			if ( ((JClass)currentJType).getTypeParameters().size() == 0 ) {
+				break;
+			}
+			currentJType = ((JClass)currentJType).getTypeParameters().get(0);
+		}
+		
 		JType indirectJType = getJType();
-		int indirection = NameUtils.getIndirectionLevel(ctype);
+		int indirection = NameUtils.getIndirectionLevel(ctype) - currentIndirection;
+		
 		for (; indirection > 0; indirection--) {
 			indirectJType = context.getCm().ref(Pointer.class).narrow(indirectJType);
 		}
diff --git a/src/gir2java/GirParser.java b/src/gir2java/GirParser.java
@@ -619,10 +619,12 @@ private ConvertedType findType(Element root, ParsingContext context) {
 				Element child = children.get(i);
 				String childQualName = child.getQualifiedName();
 				if (childQualName.equals("array")) {
-					//found an <array>, treat it like a pointer to its element type
+					//found an <array>, try taking its c:type, and the name of the core type, and using that
+					//to make a ConvertedType
 					convType = findSimpleType(child, context);
+					String arrayCType = child.getAttributeValue("type", Constants.GIR_XMLNS_C);
 					if (convType != null) {
-						convType = convType.pointerTypeTo();
+						convType = convType.forCType(context, arrayCType);
 					}
 					System.out.println("found an array, treating it as " + convType);
 					break;
@@ -816,7 +818,8 @@ private void parseMethodOrFunction(Element root, ParsingContext context) {
 			
 			if (returnsPointer) {
 				// Pointer.pointerToAddress(native(...), ReturnType.class)
-				JClass returnClass = (JClass)returnType.forCType(nextContext, returnType.getCtype()).getJType();
+				ConvertedType returnConvType = returnType.forCType(nextContext, returnType.getCtype());
+				JClass returnClass = (JClass)returnConvType.getJType();
 				
 				JInvocation pointerToAddressCall =
 					context
