If a type is mapped to Pointer, it is not struct by value

octachoron · octachoron · commit 5433bff16ac5 · 2014-08-14T22:07:33.000+02:00
This condition was not checked in ConvertedType.isStructByValue(),
and methods we can generate got mistakenly ignored.
diff --git a/src/gir2java/ConvertedType.java b/src/gir2java/ConvertedType.java
@@ -74,7 +74,7 @@ public boolean isStructByValue() {
 			return false;
 		}
 		
-		if ( (getJType() != null) && getJType().isPrimitive() ) {
+		if ( (getJType() != null) && (getJType().isPrimitive() || getJType().erasure().name().equals("Pointer")) ) {
 			return false;
 		}
 		
diff --git a/src/gir2java/GirParser.java b/src/gir2java/GirParser.java
@@ -717,14 +717,18 @@ private boolean checkUndefined(Element root, ParsingContext context) {
 	
 	private boolean checkStructByValue(ConvertedType returnType, List<ParameterDescriptor> parametersList) {
 		if (returnType.isStructByValue()) {
+			System.out.println("Struct by value found as return type: " + returnType.toString());
 			return true;
 		}
 		
+		int i = 0;
 		if (parametersList != null) {
 			for (ParameterDescriptor param : parametersList) {
 				if ((param.getType()) != null && param.getType().isStructByValue()) {
+					System.out.println("Struct by value found as parameter no. " + i + ":" + param.getType());
 					return true;
 				}
+				i++;
 			}
 		}
 		
@@ -759,6 +763,7 @@ private void parseMethodOrFunction(Element root, ParsingContext context) {
 		}
 		
 		if (checkStructByValue(returnType, parametersList)) {
+			System.out.println("Skipped " + nativeName + "() because it takes or returns struct by value");
 			return;
 		}
 		

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ public boolean isStructByValue() {`
`74`	`74`	`return false;`
`75`	`75`	`}`
`76`	`76`
`77`		`- if ( (getJType() != null) && getJType().isPrimitive() ) {`
	`77`	`+ if ( (getJType() != null) && (getJType().isPrimitive() \|\| getJType().erasure().name().equals("Pointer")) ) {`
`78`	`78`	`return false;`
`79`	`79`	`}`
`80`	`80`
Original file line number	Diff line number	Diff line change
`@@ -717,14 +717,18 @@ private boolean checkUndefined(Element root, ParsingContext context) {`
`717`	`717`
`718`	`718`	`private boolean checkStructByValue(ConvertedType returnType, List<ParameterDescriptor> parametersList) {`
`719`	`719`	`if (returnType.isStructByValue()) {`
	`720`	`+ System.out.println("Struct by value found as return type: " + returnType.toString());`
`720`	`721`	`return true;`
`721`	`722`	`}`
`722`	`723`
	`724`	`+ int i = 0;`
`723`	`725`	`if (parametersList != null) {`
`724`	`726`	`for (ParameterDescriptor param : parametersList) {`
`725`	`727`	`if ((param.getType()) != null && param.getType().isStructByValue()) {`
	`728`	`+ System.out.println("Struct by value found as parameter no. " + i + ":" + param.getType());`
`726`	`729`	`return true;`
`727`	`730`	`}`
	`731`	`+ i++;`
`728`	`732`	`}`
`729`	`733`	`}`
`730`	`734`
`@@ -759,6 +763,7 @@ private void parseMethodOrFunction(Element root, ParsingContext context) {`
`759`	`763`	`}`
`760`	`764`
`761`	`765`	`if (checkStructByValue(returnType, parametersList)) {`
	`766`	`+ System.out.println("Skipped " + nativeName + "() because it takes or returns struct by value");`
`762`	`767`	`return;`
`763`	`768`	`}`
`764`	`769`